workflows/build.yml: add unittests for linux

CMakeLists.txt minor refactoring

Author: s1lentq

.github/workflows/build.yml

@@ -34,19 +34,15 @@ jobs:
         with:
           nuget-api-key: ${{ secrets.NuGetAPIKey }}
           nuget-version: '5.x'
+
       - run: nuget restore '${{ env.solution }}'
 
       - name: Setup MSBuild
         uses: microsoft/[email protected]
         with:
           vs-version: '16.8'
 
-      - name: Build ReHLDS
-        run: |
-          msbuild ${{ env.solution }} -p:Configuration="${{ env.buildRelease }}" /t:Clean,Build /p:Platform=${{ env.buildPlatform }} /p:PlatformToolset=v140_xp /p:XPDeprecationWarning=false
-          msbuild ${{ env.solution }} -p:Configuration="${{ env.buildReleasePlay }}" /t:Clean,Build /p:Platform=${{ env.buildPlatform }} /p:PlatformToolset=v140_xp /p:XPDeprecationWarning=false
-
-      - name: Build and Testing
+      - name: Build and Run unittests
         run: |
           msbuild ${{ env.solution }} -p:Configuration="${{ env.buildTest }}" /t:Clean,Build /p:Platform=${{ env.buildPlatform }} /p:PlatformToolset=v140_xp /p:XPDeprecationWarning=false
           .\"msvc\Test Fixes\swds.exe"
@@ -55,6 +51,11 @@ jobs:
           {[Environment]::Exit(1)}
         shell: "pwsh"
 
+      - name: Build
+        run: |
+          msbuild ${{ env.solution }} -p:Configuration="${{ env.buildRelease }}" /t:Clean,Build /p:Platform=${{ env.buildPlatform }} /p:PlatformToolset=v140_xp /p:XPDeprecationWarning=false
+          msbuild ${{ env.solution }} -p:Configuration="${{ env.buildReleasePlay }}" /t:Clean,Build /p:Platform=${{ env.buildPlatform }} /p:PlatformToolset=v140_xp /p:XPDeprecationWarning=false
+
       - name: Move files
         run: |
           mkdir publish\debug
@@ -112,17 +113,17 @@ jobs:
           mv $GITHUB_WORKSPACE/tests/swds.dll .
 
           descs=(
+            "CS: Multiplayer"
             "Half-Life: Physics singleplayer"
             "Half-Life: Multiplayer on crossfire map"
             "Half-Life: Shooting with several weapons"
-            "CS: Multiplayer"
           )
 
           demos=(
+            "cstrike-muliplayer-1"
             "rehlds-phys-single1"
             "crossfire-1-multiplayer-1"
             "shooting-hl-1"
-            "cstrike-muliplayer-1"
           )
 
           retVal=0
@@ -168,6 +169,30 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Build and Run unittests
+        run: |
+          rm -rf build && CC=icc CXX=icpc cmake -DCMAKE_BUILD_TYPE=Unittests -B build && cmake --build build -j8
+          retVal=0
+          export LD_LIBRARY_PATH="rehlds/lib/linux32:$LD_LIBRARY_PATH"
+          ./build/rehlds/engine_i486 2> /dev/null > result.log || retVal=$?
+          while read line; do
+            if [[ ${line} == *"Warning in test"* ]] ; then
+              echo -e "\e[2;38m$line"
+            elif [[ ${line} == *"Failure in test"* ]] ; then
+              echo -e "\e[1;31m$line"
+            else
+              echo -e "\e[0;33m$line"
+            fi
+          done <<< $(cat result.log)
+
+          if [ $retVal -ne 0 ] && [ $retVal -ne 3 ]; then
+            echo -e "\e[30;41mExit code: $retVal\e[0m"
+            exit 1 # Unittest failed
+          else
+            echo -e "\e[30;43mExit code: $retVal\e[0m"
+          fi
+        shell: bash
+          
       - name: Build using Intel C++ Compiler
         run: |
           rm -rf build && CC=icc CXX=icpc cmake -B build && cmake --build build -j8
@@ -244,14 +269,14 @@ jobs:
       - name: Reading appversion.h
         run: |
           if [ -e appversion.h ]; then
-          	APP_VERSION=$(cat appversion.h | grep -wi '#define APP_VERSION_STRD' | sed -e 's/#define APP_VERSION_STRD[ \t\r\n\v\f]\+\(.*\)/\1/i' -e 's/\r//g')
-          	if [ $? -ne 0 ]; then
-          		APP_VERSION=""
-          	else
-          		# Remove quotes
-          		APP_VERSION=$(echo $APP_VERSION | xargs)
-          		echo "APP_VERSION=${APP_VERSION}" >> $GITHUB_ENV
-          	fi
+            APP_VERSION=$(cat appversion.h | grep -wi '#define APP_VERSION_STRD' | sed -e 's/#define APP_VERSION_STRD[ \t\r\n\v\f]\+\(.*\)/\1/i' -e 's/\r//g')
+            if [ $? -ne 0 ]; then
+              APP_VERSION=""
+            else
+              # Remove quotes
+              APP_VERSION=$(echo $APP_VERSION | xargs)
+              echo "APP_VERSION=${APP_VERSION}" >> $GITHUB_ENV
+            fi
           fi
           rm -f appversion.h
 

.gitignore

@@ -3,6 +3,7 @@
 *.bat
 *.log
 *.lnk
+*.aps
 **/msvc/Debug*
 **/msvc/Release*
 **/msvc/Tests

CMakeLists.txt

@@ -10,6 +10,9 @@ add_custom_target(appversion DEPENDS
 )
 
 add_subdirectory(rehlds)
-add_subdirectory(rehlds/dedicated)
-add_subdirectory(rehlds/filesystem)
-add_subdirectory(rehlds/HLTV)
+
+if (NOT CMAKE_BUILD_TYPE MATCHES Unittests)
+	add_subdirectory(rehlds/dedicated)
+	add_subdirectory(rehlds/filesystem)
+	add_subdirectory(rehlds/HLTV)
+endif()

dep/cppunitlite/CMakeLists.txt

@@ -0,0 +1,25 @@
+cmake_minimum_required(VERSION 3.1)
+project(cppunitlite CXX)
+
+add_library(cppunitlite STATIC)
+
+target_sources(cppunitlite PRIVATE
+	src/Test.cpp
+	src/TestResult.cpp
+	src/TestRegistry.cpp
+	src/Assertions.cpp
+	src/MainAdapter.cpp
+)
+
+target_include_directories(cppunitlite PRIVATE
+	"${PROJECT_SOURCE_DIR}/src"
+	"${PROJECT_SOURCE_DIR}/include"
+)
+
+target_compile_definitions(cppunitlite PRIVATE
+	_GLIBCXX_USE_CXX11_ABI=0
+)
+
+target_compile_options(cppunitlite PRIVATE
+	-m32
+)

dep/cppunitlite/include/cppunitlite/GradleAdapter.h dep/cppunitlite/include/cppunitlite/MainAdapter.h

@@ -1,6 +1,6 @@
 #pragma once
 
-class GradleAdapter {
+class MainAdapter {
 public:
 	int writeAllTestsInfoToFile(const char* fname);
 	int runTest(const char* groupName, const char* testName);

dep/cppunitlite/include/cppunitlite/Test.h

@@ -20,15 +20,15 @@ class Test
 	void			setNext(Test *test);
 	Test			*getNext () const;
 	void run(TestResult& result);
-	
+
 	const char* getName() {
 		return name_.c_str();
 	}
 
 	const char* getGroup() {
 		return group_.c_str();
 	}
-	
+
 	int getTimeout() {
 		return timeout_;
 	}
@@ -47,7 +47,7 @@ class Test
 	{ public: testGroup##testName##Test () : Test (#testName , #testGroup , testTimeout) {} \
             void runInternal (); } \
     testGroup##testName##Instance; \
-	void testGroup##testName##Test::runInternal() 
+	void testGroup##testName##Test::runInternal()
 
 
 

dep/cppunitlite/msvc/cppunitlite.vcxproj

@@ -13,15 +13,15 @@
   <ItemGroup>
     <ClInclude Include="..\include\cppunitlite\Assertions.h" />
     <ClInclude Include="..\include\cppunitlite\Failure.h" />
-    <ClInclude Include="..\include\cppunitlite\GradleAdapter.h" />
+    <ClInclude Include="..\include\cppunitlite\MainAdapter.h" />
     <ClInclude Include="..\include\cppunitlite\Test.h" />
     <ClInclude Include="..\include\cppunitlite\TestHarness.h" />
     <ClInclude Include="..\include\cppunitlite\TestRegistry.h" />
     <ClInclude Include="..\include\cppunitlite\TestResult.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\Assertions.cpp" />
-    <ClCompile Include="..\src\GradleAdapter.cpp" />
+    <ClCompile Include="..\src\MainAdapter.cpp" />
     <ClCompile Include="..\src\Test.cpp" />
     <ClCompile Include="..\src\TestRegistry.cpp" />
     <ClCompile Include="..\src\TestResult.cpp" />

dep/cppunitlite/msvc/cppunitlite.vcxproj.filters

@@ -27,7 +27,7 @@
     <ClInclude Include="..\include\cppunitlite\TestResult.h">
       <Filter>include</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\cppunitlite\GradleAdapter.h">
+    <ClInclude Include="..\include\cppunitlite\MainAdapter.h">
       <Filter>include</Filter>
     </ClInclude>
   </ItemGroup>
@@ -44,7 +44,7 @@
     <ClCompile Include="..\src\TestResult.cpp">
       <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\GradleAdapter.cpp">
+    <ClCompile Include="..\src\MainAdapter.cpp">
       <Filter>src</Filter>
     </ClCompile>
   </ItemGroup>

dep/cppunitlite/src/GradleAdapter.cpp dep/cppunitlite/src/MainAdapter.cpp

@@ -2,11 +2,11 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "cppunitlite/GradleAdapter.h"
+#include "cppunitlite/MainAdapter.h"
 #include "cppunitlite/Test.h"
 #include "cppunitlite/TestRegistry.h"
 
-int GradleAdapter::writeAllTestsInfoToFile(const char* fname) {
+int MainAdapter::writeAllTestsInfoToFile(const char* fname) {
 	FILE* outFile = fopen(fname, "w");
 	if (outFile == NULL) {
 		return 1;
@@ -33,7 +33,7 @@ int GradleAdapter::writeAllTestsInfoToFile(const char* fname) {
 	return 0;
 }
 
-int GradleAdapter::runTest(const char* groupName, const char* testName) {
+int MainAdapter::runTest(const char* groupName, const char* testName) {
 	Test* curTest = TestRegistry::getFirstTest();
 	while (curTest != NULL) {
 		if (!strcmp(groupName, curTest->getGroup()) && !strcmp(testName, curTest->getName())) {
@@ -61,7 +61,7 @@ int GradleAdapter::runTest(const char* groupName, const char* testName) {
 	}
 }
 
-int GradleAdapter::runGroup(const char* groupName) {
+int MainAdapter::runGroup(const char* groupName) {
 	Test* curTest = TestRegistry::getFirstTest();
 	int ranTests = 0;
 	int warnTest = 0;
@@ -101,7 +101,7 @@ int GradleAdapter::runGroup(const char* groupName) {
 	return 0;
 }
 
-int GradleAdapter::runAllTests() {
+int MainAdapter::runAllTests() {
 	Test* curTest = TestRegistry::getFirstTest();
 	int ranTests = 0;
 	int warnTest = 0;
@@ -131,7 +131,7 @@ int GradleAdapter::runAllTests() {
 	return 0;
 }
 
-int GradleAdapter::testsEntryPoint(int argc, char* argv[]) {
+int MainAdapter::testsEntryPoint(int argc, char* argv[]) {
 	if (argc < 2 || !strcmp(argv[1], "-all")) {
 		return runAllTests();
 	}

dep/cppunitlite/src/Test.cpp

@@ -5,10 +5,11 @@
 #include "cppunitlite/Failure.h"
 
 #include <exception>
+#include <iostream>
 #include <sstream>
 
 
-Test::Test (const char* testName, const char* testGroup, int timeout) 
+Test::Test (const char* testName, const char* testGroup, int timeout)
 	: name_ (testName), group_ (testGroup), timeout_(timeout)
 {
 	next_ = NULL;
@@ -23,13 +24,14 @@ Test *Test::getNext() const
 
 
 void Test::setNext(Test *test)
-{	
+{
 	next_ = test;
 }
 
 void Test::run(TestResult &result) {
 	try {
 		runInternal();
+		std::cout << "Test::run() > " << group_ << "::" << name_ << " Passed" << std::endl;
 	} catch (TestFailException &e) {
 		result.addFailure(Failure(e, name_));
 	} catch (std::exception &e) {