coder137 · coder137 · Dec 8, 2021 · Dec 8, 2021 · Dec 8, 2021 · Dec 8, 2021
diff --git a/bootstrap/src/build_buildcc.cpp b/bootstrap/src/build_buildcc.cpp
@@ -53,11 +53,6 @@ void buildcc_cb(BaseTarget &target, const BaseGenerator &schema_gen,
   target.AddIncludeDir("lib/env/include");
   target.GlobHeaders("lib/env/include/env");
 
-  // COMMAND
-  target.GlobSources("lib/command/src");
-  target.AddIncludeDir("lib/command/include");
-  target.GlobHeaders("lib/command/include/command");
-
   // TOOLCHAIN
   target.AddIncludeDir("lib/toolchain/include");
   target.GlobHeaders("lib/toolchain/include/toolchain");

diff --git a/buildcc/CMakeLists.txt b/buildcc/CMakeLists.txt
@@ -34,9 +34,6 @@ endif()
 # Environment
 add_subdirectory(lib/env)
 
-# 
-add_subdirectory(lib/command)
-
 # Toolchain
 add_subdirectory(lib/toolchain)
 add_subdirectory(toolchains)

diff --git a/buildcc/buildcc.h b/buildcc/buildcc.h
@@ -26,9 +26,7 @@
 #include "env/host_os.h"
 #include "env/host_compiler.h"
 #include "env/util.h"
-
-// 
-#include "command/command.h"
+#include "env/command.h"
 
 // Base
 #include "toolchain/toolchain.h"

diff --git a/buildcc/lib/args/src/register.cpp b/buildcc/lib/args/src/register.cpp
@@ -129,7 +129,7 @@ void Register::Env() {
 void TestInfo::TestRunner() const {
   env::log_info(__FUNCTION__,
                 fmt::format("Testing \'{}\'", target_.GetUniqueId()));
-  Command command;
+  env::Command command;
   command.AddDefaultArguments({
       {"executable", fmt::format("{}", target_.GetTargetPath())},
   });
@@ -173,8 +173,8 @@ void TestInfo::TestRunner() const {
   };
 
   const bool success =
-      Command::Execute(test_command, config_.GetWorkingDirectory(),
-                       redirect_stdout, redirect_stderr);
+      env::Command::Execute(test_command, config_.GetWorkingDirectory(),
+                            redirect_stdout, redirect_stderr);
   env::assert_fatal(success,
                     fmt::format("Could not run {}", target_.GetUniqueId()));
 

diff --git a/buildcc/lib/args/src/tasks.cpp b/buildcc/lib/args/src/tasks.cpp
@@ -16,6 +16,7 @@
 
 #include "args/register.h"
 #include "env/logging.h"
+#include "env/util.h"
 
 namespace buildcc {
 
@@ -33,6 +34,8 @@ void Register::RunBuild() {
                                           executor_.num_workers()));
   executor_.run(build_tf_);
   executor_.wait_for_all();
+  env::assert_fatal(env::get_task_state() == env::TaskState::SUCCESS,
+                    "Task state is not successful!");
 }
 
 void Register::RunTest() {

diff --git a/buildcc/lib/args/test/test_register.cpp b/buildcc/lib/args/test/test_register.cpp
@@ -535,7 +535,7 @@ TEST(RegisterTestGroup, Register_Test) {
 
     std::vector<std::string> stdout_data;
     std::vector<std::string> stderr_data;
-    buildcc::m::CommandExpect_Execute(1, true, &stdout_data, &stderr_data);
+    buildcc::env::m::CommandExpect_Execute(1, true, &stdout_data, &stderr_data);
     reg.RunTest();
   }
 
@@ -588,7 +588,7 @@ TEST(RegisterTestGroup, Register_TestWithOutput) {
             {}, {},
             buildcc::TestOutput(buildcc::TestOutput::Type::DefaultBehaviour)));
 
-    buildcc::m::CommandExpect_Execute(1, true);
+    buildcc::env::m::CommandExpect_Execute(1, true);
     reg.RunTest();
   }
 
@@ -606,7 +606,7 @@ TEST(RegisterTestGroup, Register_TestWithOutput) {
             buildcc::TestOutput(buildcc::TestOutput::Type::TestPrintOnStderr)));
 
     std::vector<std::string> stderr_data;
-    buildcc::m::CommandExpect_Execute(1, true, nullptr, &stderr_data);
+    buildcc::env::m::CommandExpect_Execute(1, true, nullptr, &stderr_data);
     reg.RunTest();
   }
 
@@ -624,7 +624,7 @@ TEST(RegisterTestGroup, Register_TestWithOutput) {
             buildcc::TestOutput(buildcc::TestOutput::Type::TestPrintOnStdout)));
 
     std::vector<std::string> stdout_data;
-    buildcc::m::CommandExpect_Execute(1, true, &stdout_data, nullptr);
+    buildcc::env::m::CommandExpect_Execute(1, true, &stdout_data, nullptr);
     reg.RunTest();
   }
 
@@ -643,7 +643,7 @@ TEST(RegisterTestGroup, Register_TestWithOutput) {
 
     std::vector<std::string> stdout_data;
     std::vector<std::string> stderr_data;
-    buildcc::m::CommandExpect_Execute(1, true, &stdout_data, &stderr_data);
+    buildcc::env::m::CommandExpect_Execute(1, true, &stdout_data, &stderr_data);
     reg.RunTest();
   }
 
@@ -660,7 +660,7 @@ TEST(RegisterTestGroup, Register_TestWithOutput) {
                  buildcc::TestOutput(buildcc::TestOutput::Type::UserRedirect,
                                      nullptr, nullptr)));
 
-    buildcc::m::CommandExpect_Execute(1, true);
+    buildcc::env::m::CommandExpect_Execute(1, true);
     reg.RunTest();
   }
 
@@ -684,7 +684,7 @@ TEST(RegisterTestGroup, Register_TestWithOutput) {
 
 int main(int ac, char **av) {
   MemoryLeakWarningPlugin::turnOffNewDeleteOverloads();
-  buildcc::m::VectorStringCopier copier;
+  buildcc::env::m::VectorStringCopier copier;
   mock().installCopier(TEST_VECTOR_STRING_TYPE, copier);
   return CommandLineTestRunner::RunAllTests(ac, av);
 }
diff --git a/buildcc/lib/command/CMakeLists.txt b/buildcc/lib/command/CMakeLists.txt
diff --git a/buildcc/lib/env/CMakeLists.txt b/buildcc/lib/env/CMakeLists.txt
@@ -6,9 +6,13 @@ if (${TESTING})
 
         src/env.cpp
         src/task_state.cpp
+
+        src/command.cpp
+        mock/execute.cpp
     )
     target_include_directories(mock_env PUBLIC 
         ${CMAKE_CURRENT_SOURCE_DIR}/include
+        ${CMAKE_CURRENT_SOURCE_DIR}/mock/include
     )
     target_link_libraries(mock_env PUBLIC
         fmt::fmt-header-only
@@ -28,8 +32,12 @@ if (${TESTING})
     add_executable(test_task_state test/test_task_state.cpp)
     target_link_libraries(test_task_state PRIVATE mock_env)
 
+    add_executable(test_command test/test_command.cpp)
+    target_link_libraries(test_command PRIVATE mock_env)
+
     add_test(NAME test_env_util COMMAND test_env_util)
     add_test(NAME test_task_state COMMAND test_task_state)
+    add_test(NAME test_command COMMAND test_command)
 endif()
 
 set(ENV_SRCS
@@ -48,6 +56,10 @@ set(ENV_SRCS
 
     src/task_state.cpp
     include/env/task_state.h
+
+    src/command.cpp
+    src/execute.cpp
+    include/env/command.h
 )
 
 if(${BUILDCC_BUILD_AS_SINGLE_LIB})
@@ -74,15 +86,14 @@ if(${BUILDCC_BUILD_AS_INTERFACE})
     target_link_options(env PRIVATE ${BUILD_LINK_FLAGS})
     target_link_libraries(env PRIVATE
         spdlog::spdlog_header_only
+        tiny-process-library::tiny-process-library
     )
+endif()
 
-    # Env install
-    if (${BUILDCC_INSTALL})
+if (${BUILDCC_INSTALL})
+    if (${BUILDCC_BUILD_AS_INTERFACE})
         install(TARGETS env DESTINATION lib EXPORT envConfig)
         install(EXPORT envConfig DESTINATION "${BUILDCC_INSTALL_LIB_PREFIX}/env")
     endif()
-endif()
-
-if (${BUILDCC_INSTALL})
     install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION "${BUILDCC_INSTALL_HEADER_PREFIX}")
 endif()
diff --git a/buildcc/lib/env/include/env/assert_fatal.h b/buildcc/lib/env/include/env/assert_fatal.h
@@ -32,7 +32,8 @@ namespace buildcc::env {
 /**
  * @brief Compile time expr asserts fatally when false
  */
-template <bool expr> inline void assert_fatal(const char *message) {
+template <bool expr>
+inline void assert_fatal([[maybe_unused]] const char *message) {
   if constexpr (!expr) {
     env::log_critical("assert", message);
     assert_handle_fatal();

diff --git a/...dcc/lib/command/include/command/command.h → buildcc/lib/env/include/env/command.h b/...dcc/lib/command/include/command/command.h → buildcc/lib/env/include/env/command.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef COMMAND_COMMAND_H_
-#define COMMAND_COMMAND_H_
+#ifndef ENV_COMMAND_H_
+#define ENV_COMMAND_H_
 
 #include <filesystem>
 #include <optional>
@@ -25,7 +25,7 @@
 
 namespace fs = std::filesystem;
 
-namespace buildcc {
+namespace buildcc::env {
 
 class Command {
 public:
@@ -82,6 +82,6 @@ class Command {
   std::unordered_map<std::string, std::string> default_values_;
 };
 
-} // namespace buildcc
+} // namespace buildcc::env
 
 #endif
diff --git a/buildcc/lib/command/mock/execute.cpp → buildcc/lib/env/mock/execute.cpp b/buildcc/lib/command/mock/execute.cpp → buildcc/lib/env/mock/execute.cpp
@@ -1,10 +1,10 @@
-#include "command/command.h"
+#include "env/command.h"
 
 #include "expect_command.h"
 
 #include "CppUTestExt/MockSupport.h"
 
-namespace buildcc {
+namespace buildcc::env {
 
 static constexpr const char *const EXECUTE_FUNCTION = "execute";
 static constexpr const char *const STDOUT_DATA_STRING = "stdout_data";
@@ -48,4 +48,4 @@ void CommandExpect_Execute(unsigned int calls, bool expectation,
 
 } // namespace m
 
-} // namespace buildcc
+} // namespace buildcc::env
diff --git a/buildcc/lib/command/mock/expect_command.h → ...dcc/lib/env/mock/include/expect_command.h b/buildcc/lib/command/mock/expect_command.h → ...dcc/lib/env/mock/include/expect_command.h
@@ -1,17 +1,17 @@
-#ifndef COMMAND_MOCK_EXPECT_COMMAND_H_
-#define COMMAND_MOCK_EXPECT_COMMAND_H_
+#ifndef ENV_MOCK_EXPECT_COMMAND_H_
+#define ENV_MOCK_EXPECT_COMMAND_H_
 
 #include <string>
 #include <vector>
 
 constexpr const char *const TEST_VECTOR_STRING_TYPE = "vector_string";
 
-namespace buildcc::m {
+namespace buildcc::env::m {
 
 void CommandExpect_Execute(unsigned int calls, bool expectation,
                            std::vector<std::string> *stdout_data = nullptr,
                            std::vector<std::string> *stderr_data = nullptr);
 
-} // namespace buildcc::m
+} // namespace buildcc::env::m
 
 #endif
diff --git a/...cc/lib/command/mock/mock_command_copier.h → ...ib/env/mock/include/mock_command_copier.h b/...cc/lib/command/mock/mock_command_copier.h → ...ib/env/mock/include/mock_command_copier.h
@@ -1,12 +1,12 @@
-#ifndef COMMAND_MOCK_MOCK_COMMAND_COPIER_H_
-#define COMMAND_MOCK_MOCK_COMMAND_COPIER_H_
+#ifndef ENV_MOCK_MOCK_COMMAND_COPIER_H_
+#define ENV_MOCK_MOCK_COMMAND_COPIER_H_
 
 #include <string>
 #include <vector>
 
 #include "CppUTestExt/MockSupport.h"
 
-namespace buildcc::m {
+namespace buildcc::env::m {
 
 class VectorStringCopier : public MockNamedValueCopier {
 public:
@@ -23,6 +23,6 @@ class VectorStringCopier : public MockNamedValueCopier {
   }
 };
 
-} // namespace buildcc::m
+} // namespace buildcc::env::m
 
 #endif
diff --git a/buildcc/lib/command/src/command.cpp → buildcc/lib/env/src/command.cpp b/buildcc/lib/command/src/command.cpp → buildcc/lib/env/src/command.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "command/command.h"
+#include "env/command.h"
 
 #include <algorithm>
 
@@ -24,7 +24,7 @@
 #include "env/assert_fatal.h"
 #include "env/logging.h"
 
-namespace buildcc {
+namespace buildcc::env {
 
 void Command::AddDefaultArgument(const std::string &key,
                                  const std::string &value) {
@@ -64,4 +64,4 @@ std::string Command::Construct(
   return fmt::vformat(pattern, store);
 }
 
-} // namespace buildcc
+} // namespace buildcc::env