Fail test

.github/workflows/windows.yml

@@ -22,25 +22,83 @@ jobs:
           msbuild /p:Configuration=Release /p:Platform=x86
           msbuild /p:Configuration=Release /p:Platform=x64
           cd Tests
-          Get-ChildItem -Path *.vcxproj | ForEach-Object {& msbuild /p:Configuration=Release /p:Platform=x86 $_.FullName}
-          Get-ChildItem -Path *.vcxproj | ForEach-Object {& msbuild /p:Configuration=Release /p:Platform=x64 $_.FullName}
+
+          $x86ExitCodes = Get-ChildItem -Path *.vcxproj | ForEach-Object {
+            & msbuild /p:Configuration=Release /p:Platform=x86 $_.FullName
+            $LASTEXITCODE
+          }
+
+          $x64ExitCodes = Get-ChildItem -Path *.vcxproj | ForEach-Object {
+            & msbuild /p:Configuration=Release /p:Platform=x64 $_.FullName
+            $LASTEXITCODE
+          }
+
+          if ($x86ExitCodes -contains 1 -or $x64ExitCodes -contains 1) {
+            Write-Host "Building Release build of tests failed."
+            exit 1
+          }
       - name: Build Debug
         run: |
           msbuild /p:Configuration=Debug /p:Platform=x86
           msbuild /p:Configuration=Debug /p:Platform=x64
           cd Tests
-          Get-ChildItem -Path *.vcxproj | ForEach-Object {& msbuild /p:Configuration=Debug /p:Platform=x86 $_.FullName}
-          Get-ChildItem -Path *.vcxproj | ForEach-Object {& msbuild /p:Configuration=Debug /p:Platform=x64 $_.FullName}
+
+          $x86ExitCodes = Get-ChildItem -Path *.vcxproj | ForEach-Object {
+            & msbuild /p:Configuration=Debug /p:Platform=x86 $_.FullName
+            $LASTEXITCODE
+          }
+
+          $x64ExitCodes = Get-ChildItem -Path *.vcxproj | ForEach-Object {
+            & msbuild /p:Configuration=Debug /p:Platform=x64 $_.FullName
+            $LASTEXITCODE
+          }
+
+          if ($x86ExitCodes -contains 1 -or $x64ExitCodes -contains 1) {
+            Write-Host "Building Debug build of tests failed."
+            exit 1
+          }
       - name: Test
         run: |
           cd Tests
-          Get-ChildItem -Path Win32\Release\*.exe | ForEach-Object {& $_.FullName}
-          Get-ChildItem -Path x64\Release\*.exe | ForEach-Object {& $_.FullName}
+
+          Get-ChildItem -Path Win32\Release\*.exe | ForEach-Object {
+            & $_.FullName
+
+            if ($LASTEXITCODE -ne 0) {
+              Write-Host "Executing Release build of x86 tests failed."
+              exit 1
+            }
+          }
+
+          Get-ChildItem -Path x64\Release\*.exe | ForEach-Object {
+            & $_.FullName
+
+            if ($LASTEXITCODE -ne 0) {
+              Write-Host "Executing Release build of x64 tests failed."
+              exit 1
+            }
+          }
       - name: Test Debug
         run: |
           cd Tests
-          Get-ChildItem -Path Win32\Debug\*.exe | ForEach-Object {& $_.FullName}
-          Get-ChildItem -Path x64\Debug\*.exe | ForEach-Object {& $_.FullName}
+
+          Get-ChildItem -Path Win32\Debug\*.exe | ForEach-Object {
+            & $_.FullName
+
+            if ($LASTEXITCODE -ne 0) {
+              Write-Host "Executing Debug build of x86 tests failed."
+              exit 1
+            }
+          }
+
+          Get-ChildItem -Path x64\Debug\*.exe | ForEach-Object {
+            & $_.FullName
+
+            if ($LASTEXITCODE -ne 0) {
+              Write-Host "Executing Debug build of x64 tests failed."
+              exit 1
+            }
+          }
       - name: Archive Libraries
         uses: actions/upload-artifact@v3
         with:

Tests/SomeDir/SomeFile.txt

@@ -1,3 +1,3 @@
 Do not edit the contents of this file!  It is used by the T_Dir test case and
-must contain precisely this test, with UNIX line endings, and must be precisely
-174 bytes long.
+must contain precisely this text, with UNIX or DOS line endings as appropriate,
+and must be precisely 236 or 239 bytes long for UNIX or Windows respectively.

Tests/T_Dir.cpp

@@ -6,6 +6,16 @@
 #include <Test.h>
 #include <string.h>
 
+#ifdef _WIN32
+
+#define SOME_FILE_SIZE 239
+
+#else /* ! _WIN32 */
+
+#define SOME_FILE_SIZE 236
+
+#endif /* ! _WIN32 */
+
 static RDir g_oDir;				/* RDir class is global to implicitly test re-use */
 static RFileUtils g_oFileUtils;	/* Class for cleaning up the file system */
 static RTest Test("T_Dir");		/* Class to use for testing and reporting results */
@@ -81,8 +91,8 @@ int main()
 	/* Test #3: Test that open() with a directory path works */
 
 	Test.Next("Test that open() with a directory path works");
-	TestScan("SomeDir", 1, 174);
-	TestScan("SomeDir/", 1, 174);
+	TestScan("SomeDir", 1, SOME_FILE_SIZE);
+	TestScan("SomeDir/", 1, SOME_FILE_SIZE);
 
 	/* Test #4: Test that open() with wildcards works */
 
@@ -92,21 +102,21 @@ int main()
 
 	TestScan("#?");
 	TestScan("#?.sln", 1, 10393);
-	TestScan("SomeDir/#?.txt", 1, 174);
+	TestScan("SomeDir/#?.txt", 1, SOME_FILE_SIZE);
 
 #else /* ! __amigaos__ */
 
 	TestScan("*");
 	TestScan("*.sln", 1, 10393);
-	TestScan("SomeDir/*.txt", 1, 174);
+	TestScan("SomeDir/*.txt", 1, SOME_FILE_SIZE);
 
 #endif /* ! __amigaos__ */
 
 	/* Test #5: Test that open() with a filename works */
 
 	Test.Next("Test that open() with a filename works");
 	TestScan("T_Dir.cpp");
-	TestScan("SomeDir/SomeFile.txt", 1, 174);
+	TestScan("SomeDir/SomeFile.txt", 1, SOME_FILE_SIZE);
 
 	/* Test #6: Test that open() with an invalid path works */
 
@@ -198,8 +208,8 @@ int main()
 
 	Test.Next("Test some paths that only work on Windows and UNIX");
 	TestScan(".");
-	TestScan("../Tests/SomeDir", 1, 174);
-	TestScan("../Tests/SomeDir/", 1, 174);
+	TestScan("../Tests/SomeDir", 1, SOME_FILE_SIZE);
+	TestScan("../Tests/SomeDir/", 1, SOME_FILE_SIZE);
 
 #endif /* ! __amigaos__ */