Merge pull request #78 from build-cpp/fix-tests

Successfully fail when running cmkr subcommands

Author: mrexodia

docs/examples/vcpkg.md

@@ -19,7 +19,7 @@ description = "Dependencies from vcpkg"
 # See https://github.com/microsoft/vcpkg/releases for vcpkg versions
 # See https://vcpkg.io/en/packages.html for available packages
 [vcpkg]
-version = "2021.05.12"
+version = "2022.11.14"
 packages = ["fmt"]
 
 [find-package]

include/arguments.hpp

@@ -7,5 +7,3 @@ const char *handle_args(int argc, char **argv);
 
 } // namespace args
 } // namespace cmkr
-
-const char *cmkr_args_handle_args(int, char **);

src/arguments.cpp

@@ -37,31 +37,21 @@ const char *handle_args(int argc, char **argv) {
     } else if (main_arg == "build") {
         auto ret = build::run(argc, argv);
         if (ret)
-            return "CMake build error!";
+            throw std::runtime_error("CMake build failed!");
         return "CMake build completed!";
     } else if (main_arg == "install") {
         auto ret = build::install();
         if (ret)
-            return "CMake install error!";
+            throw std::runtime_error("CMake install failed!");
         return "CMake install completed!";
     } else if (main_arg == "clean") {
         auto ret = build::clean();
         if (ret)
-            return "CMake clean error!";
+            throw std::runtime_error("CMake clean failed!");
         return "Cleaned build directory!";
     } else {
         throw std::runtime_error(cmkr::help::message());
     }
 }
 } // namespace args
 } // namespace cmkr
-
-const char *cmkr_args_handle_args(int argc, char **argv) {
-    try {
-        return cmkr::args::handle_args(argc, argv);
-    } catch (const std::exception &e) {
-        return e.what();
-    } catch (...) {
-        return "Unknown error!";
-    }
-}

tests/conditions/src/win32.cpp renamed to tests/conditions/src/windows_specific.cpp

@@ -4,5 +4,5 @@
 
 int main()
 {
-    printf("mylib version: %s\n", mylib::version())
-}
+    printf("mylib version: %s\n", mylib::version());
+}

tests/interface/src/main.cpp

@@ -7,7 +7,7 @@ description = "Dependencies from vcpkg"
 # See https://github.com/microsoft/vcpkg/releases for vcpkg versions
 # See https://vcpkg.io/en/packages.html for available packages
 [vcpkg]
-version = "2021.05.12"
+version = "2022.11.14"
 packages = ["fmt"]
 
 [find-package]