Merge pull request #1194 from asarium/unittests/appveyor

Execute unit tests on appveyor

Author: MageKing17

appveyor.yml

@@ -15,7 +15,8 @@ before_build:
   - git submodule update --init --recursive
 build_script:
   - ps: . $Env:APPVEYOR_BUILD_FOLDER/ci/appveyor/build.ps1
-
+test_script:
+  - ps: . $Env:APPVEYOR_BUILD_FOLDER/ci/appveyor/test.ps1
 
 deploy:
     - provider: GitHub

ci/appveyor/build.ps1

@@ -111,7 +111,7 @@ if ($DeployBuild) {
     7z a "$($PackageName)-builds-$($buildConfig.PackageType).zip" "$env:APPVEYOR_BUILD_FOLDER/../install/*"
     Push-AppveyorArtifact "$($PackageName)-builds-$($buildConfig.PackageType).zip"
 } else {
-	cmake -DFSO_USE_SPEECH="ON" -DFSO_FATAL_WARNINGS="ON" -DFSO_USE_VOICEREC="ON" -DMSVC_SIMD_INSTRUCTIONS=SSE2 `
+	cmake -DFSO_USE_SPEECH="ON" -DFSO_FATAL_WARNINGS="ON" -DFSO_USE_VOICEREC="ON" -DFSO_BUILD_TESTS="ON" -DMSVC_SIMD_INSTRUCTIONS=SSE2 `
 	-G "$Env:CMAKE_GENERATOR" -T "$Env:PlatformToolset" ..
 
     cmake --build . --config "$Env:CONFIGURATION" -- /verbosity:minimal

ci/appveyor/test.ps1

@@ -0,0 +1,26 @@
+
+if ([System.Convert]::ToBoolean($env:DeployBuild)) {
+    # Skip tests for deployment
+    exit 0
+} else {
+    # Appveyor doesn't have OpenAL so copy our DLLs to the output FOLDER
+    $arch=""
+    if ($Env:CMAKE_GENERATOR -Match "Win64") {
+        $arch="win64"
+    } else {
+        $arch="win32"
+    }
+    $dllPath = "$Env:APPVEYOR_BUILD_FOLDER\lib\openal\libs\$arch\OpenAL32.dll"
+    $copyDestination = "$pwd\bin\$Env:CONFIGURATION\"
+    
+    write "Copying OpenAL DLL..."
+    Copy-Item "$dllPath" "$copyDestination"
+    
+    write "Running unit tests..."
+    # Run unit tests
+    &"$pwd\bin\$Env:CONFIGURATION\unittests.exe" --gtest_shuffle 2>&1
+
+    if (! ($?)) {
+        exit 1
+    }
+}

cmake/util.cmake

@@ -66,6 +66,22 @@ ENDIF(EXISTS \"${CMAKE_CURRENT_BINARY_DIR}/${TARGET}/${FILE}\")
 	SET(${OUTVAR} "${CMAKE_COMMAND}" -P ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}/${NAME} PARENT_SCOPE)
 ENDFUNCTION(EP_CHECK_FILE_EXISTS)
 
+MACRO(COPY_FILE_TO_TARGET _target _file)
+	if(UNIX)
+		ADD_CUSTOM_COMMAND(
+			TARGET ${_target} POST_BUILD
+			COMMAND cp -a "${_file}"  "$<TARGET_FILE_DIR:${_target}>/${LIBRAY_DESTINATION}/"
+			COMMENT "copying '${_file}'..."
+		)
+	else()
+		ADD_CUSTOM_COMMAND(
+			TARGET ${_target} POST_BUILD
+			COMMAND ${CMAKE_COMMAND} -E copy_if_different "${_file}"  "$<TARGET_FILE_DIR:${_target}>/${LIBRAY_DESTINATION}/"
+			COMMENT "copying '${_file}'..."
+		)
+	endif()
+endmacro(COPY_FILE_TO_TARGET)
+
 MACRO(COPY_FILES_TO_TARGET _target)
 	if(UNIX)
 		ADD_CUSTOM_COMMAND(
@@ -76,19 +92,7 @@ MACRO(COPY_FILES_TO_TARGET _target)
 	endif()
 
 	FOREACH(file IN LISTS TARGET_COPY_FILES)
-		if(UNIX)
-			ADD_CUSTOM_COMMAND(
-				TARGET ${_target} POST_BUILD
-				COMMAND cp -a "${file}"  "$<TARGET_FILE_DIR:${_target}>/${LIBRAY_DESTINATION}/"
-				COMMENT "copying '${file}'..."
-			)
-		else()
-			ADD_CUSTOM_COMMAND(
-				TARGET ${_target} POST_BUILD
-				COMMAND ${CMAKE_COMMAND} -E copy_if_different "${file}"  "$<TARGET_FILE_DIR:${_target}>/${LIBRAY_DESTINATION}/"
-				COMMENT "copying '${file}'..."
-			)
-		endif()
+		COPY_FILE_TO_TARGET("${_target}" "${file}")
 	ENDFOREACH(file)
 ENDMACRO(COPY_FILES_TO_TARGET)
 

lib/openal/libs/win32/OpenAL32.dll

@@ -12,3 +12,6 @@ set_target_properties(unittests PROPERTIES FOLDER "tests")
 file(TO_NATIVE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../test_data" TEST_DATA_PATH)
 string(REPLACE "\\" "\\\\" TEST_DATA_PATH "${TEST_DATA_PATH}")
 target_compile_definitions(unittests PRIVATE "TEST_DATA_PATH=\"${TEST_DATA_PATH}\"")
+
+INCLUDE(util)
+COPY_FILES_TO_TARGET(unittests)

lib/openal/libs/win64/OpenAL32.dll

@@ -9,20 +9,3 @@ using namespace luacpp::args;
 class LuaArgumentTest: public LuaStateTest {
 };
 
-TEST_F(LuaArgumentTest, GetArgs) {
-	ScopedLuaStackTest stackTest(L);
-
-	lua_pushliteral(L, "Abcdefg");
-
-	std::string arg1;
-	int arg2;
-
-	int n = getArgs(L, arg1, optional, arg2);
-
-	ASSERT_EQ(1, n);
-	ASSERT_STREQ("Abcdefg", arg1.c_str());
-
-	ASSERT_EQ(1, lua_gettop(L));
-
-	lua_pop(L, 1);
-}

test/src/CMakeLists.txt

@@ -3,6 +3,8 @@
 #include <gtest/gtest.h>
 #include <globalincs/vmallocator.h>
 
+#include <cstdint>
+
 namespace test {
 
 enum InitFlags {
@@ -14,7 +16,7 @@ enum InitFlags {
 
 class FSTestFixture: public ::testing::Test {
  private:
-	uint64_t _initFlags;
+	std::uint64_t _initFlags;
 
 	SCP_vector<SCP_string> _cmdlineArgs;
 	SCP_string _currentModDir;