Add support for CTest (better IDE compatibility)

Author: DarkWanderer

CMakeLists.txt

@@ -274,3 +274,6 @@ if (SQFVM_BUILD_STATIC_LIBRARY_SQC_SUPPORT)
           /W4>)
     SET_TARGET_PROPERTIES(slibsqfvm_sqc PROPERTIES PREFIX "")
 endif ()
+
+enable_testing()
+add_subdirectory(tests)

src/cli/cli.cpp

@@ -336,7 +336,12 @@ int cli::cli_from_file(const char* arg0, std::filesystem::path path)
     }
     catch (std::runtime_error& err)
     {
-        std::cout << err.what() << std::endl;
+        std::cerr << err.what() << std::endl;
+        return -1;
+    }
+    catch (...)
+    {
+        std::cerr << "Unknown exception" << std::endl;
         return -1;
     }
 }

src/cli/main.cpp

@@ -106,6 +106,7 @@ int main(int argc, char** argv)
     auto res = main_actual(argc, argv);
     return res;
 }
+
 int main_actual(int argc, char** argv)
 {
 #ifdef WIN32
@@ -126,6 +127,13 @@ int main_actual(int argc, char** argv)
     }
 #endif // DF__CLI_PRINT_INPUT_ARGS
 
-    cli command_line_interface;
-    return command_line_interface.run(argc, const_cast<const char**>(argv));
+    try {
+        cli command_line_interface;
+        return command_line_interface.run(argc, const_cast<const char**>(argv));
+    }
+    catch (std::exception& ex)
+    {
+        std::cerr << ex.what() << std::endl;
+        return -1;
+    }
 }

src/runtime/logging.cpp

@@ -2764,7 +2764,7 @@ namespace logmessage::runtime
     }
     std::string ContextValuePrint::formatMessage() const
     {
-        const auto messageA = "Context droped with return value `"sv;
+        const auto messageA = "Context dropped with return value `"sv;
         const auto messageB = "`."sv;
         auto value_sqf = value.to_string_sqf();
 

tests/CMakeLists.txt

@@ -0,0 +1,32 @@
+# Register all .sqf tests
+
+set(TEST_CONFIG_LOCATION ${CMAKE_CURRENT_SOURCE_DIR}/config.cpp)
+
+function(add_sqf_run_test test_full_path)
+	get_filename_component(test_name ${test_full_path} NAME_WE)
+	set(test_full_name run.${test_name})
+
+	message("Registering test " ${test_full_path} " as " ${test_full_name})
+	add_test(
+		NAME "${test_full_name}"
+		COMMAND sqfvm -a -V --no-execute-print --input-sqf ${test_full_path} --input-config ${TEST_CONFIG_LOCATION} --max-runtime 10000
+		WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+	)
+	set_tests_properties(${test_full_name} PROPERTIES TIMEOUT 11)
+endfunction()
+
+function(add_sqf_preprocess_test test_full_path)
+	get_filename_component(test_name ${test_full_path} NAME_WE)
+	set(test_full_name preprocess.${test_name})
+
+	message("Registering test " ${test_full_path} " as " ${test_full_name})
+	add_test(
+		NAME "${test_full_name}"
+		COMMAND sqfvm -a -V --no-execute-print --preprocess-file ${test_full_path} --input-config ${TEST_CONFIG_LOCATION} --max-runtime 10000
+		WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+	)
+endfunction()
+
+add_subdirectory(sqf)
+add_subdirectory(preprocess)
+add_subdirectory(cba)

tests/cba/CMakeLists.txt

@@ -0,0 +1 @@
+add_sqf_run_test(${CMAKE_CURRENT_SOURCE_DIR}/cba_a3.sqf)

tests/cba_a3.py tests/cba/cba_a3.pytests/cba_a3.py renamed to tests/cba/cba_a3.py

@@ -0,0 +1,4 @@
+file(GLOB_RECURSE test_script_files "*.sqf")
+foreach(test_full_path ${test_script_files})
+	add_sqf_preprocess_test(${test_full_path})
+endforeach()

tests/cba_a3.sqf tests/cba/cba_a3.sqftests/cba_a3.sqf renamed to tests/cba/cba_a3.sqf

@@ -0,0 +1,4 @@
+file(GLOB_RECURSE test_script_files "*.sqf")
+foreach(test_full_path ${test_script_files})
+	add_sqf_run_test(${test_full_path})
+endforeach()