Fix up CI.

Author: michaelrsweet

.github/workflows/build.yml

@@ -30,7 +30,7 @@ jobs:
     - name: Make libcups
       run: make
     - name: Test libcups
-      run: make test || cat cups/test.log
+      run: make test || cat cups/test.log && exit 1
 
   build-linux-gnutls:
 
@@ -54,7 +54,7 @@ jobs:
     - name: Make libcups
       run: make
     - name: Test libcups
-      run: make test || cat cups/test.log
+      run: make test || cat cups/test.log && exit 1
 
   build-macos:
 
@@ -70,7 +70,7 @@ jobs:
     - name: Make libcups
       run: make
     - name: Test libcups
-      run: make test || cat cups/test.log
+      run: make test || cat cups/test.log && exit 1
 
   build-windows:
 
@@ -87,3 +87,5 @@ jobs:
       run: cd vcnet; nuget restore libcups.sln; cd ../pdfio; nuget restore
     - name: Build libcups
       run: cd vcnet; msbuild libcups.sln
+    - name: Test libcups
+      run: cd vcnet; ./runtests.bat

cups/Makefile

@@ -194,10 +194,6 @@ test:		$(UNITTARGETS)
 	date >test.log
 	echo Running array API tests...
 	./testarray 2>>test.log
-#	if test `uname` != Darwin; then \
-#		echo Running CUPS API tests...; \
-#		./testcups 2>>test.log; \
-#	fi
 	echo ""
 	echo Running clock API tests...
 	./testclock 2>>test.log
@@ -213,9 +209,6 @@ test:		$(UNITTARGETS)
 	echo ""
 	echo Running form API tests...
 	./testform 2>>test.log
-#	echo ""
-#	echo Running cupsGetDests API tests...
-#	./testgetdests 2>>test.log
 	echo ""
 	echo Running hash API tests...
 	./testhash 2>>test.log

vcnet/runtests.bat

@@ -6,8 +6,8 @@
 ::
 
 :: Copy DLLs for dependent packages to the debug directory...
-copy packages\libpng_native.redist.1.6.30\build\native\bin\x64\Debug\*.dll %1
-copy packages\libpng_native.redist.1.6.30\build\native\bin\x64\Release\*.dll %1
+copy ..\pdfio\packages\libpng_native.redist.1.6.30\build\native\bin\x64\Debug\*.dll %1
+copy ..\pdfio\packages\libpng_native.redist.1.6.30\build\native\bin\x64\Release\*.dll %1
 
 copy packages\libressl_native.redist.4.0.0\build\native\bin\x64\Debug\*.dll %1
 copy packages\libressl_native.redist.4.0.0\build\native\bin\x64\Release\*.dll %1
@@ -24,6 +24,6 @@ cd %1
 
 start "" cmd /c ".\ippeveprinter.exe -vvv -a ../../../tools/test.conf -n localhost 'Test Printer' >test.log"
 
-.\ippfind.exe -T 30 --literal-name "Test Printer" --exec ipptool.exe -V 2.0 -tIf ../../../examples/document-letter.pdf '{}' ../../../examples/ipp-2.0.test ';'
+.\ippfind.exe -T 30 --literal-name "Test Printer" --exec ipptool.exe -V 2.0 -tIf ../../../examples/document-letter.pdf '{}' ../../../examples/ipp-2.0.test ../../../examples/pwg5100.1.test ../../../examples/pwg5100.2.test ../../../examples/pwg5100.7.test ../../../examples/pwg5100.13.test ';'
 
 :: taskkill /im ippeveprinter.exe