Unit test: print multiple log files

.travis.yml

@@ -100,13 +100,17 @@ script:
   - if [ "${MACOSX_PACKAGE}" == "1" ]; then
       cd "${TRAVIS_BUILD_DIR}";
       make -f Makefile.osx package;
-      pwd;
-      ls -la unittest;
       cat unittest/test-*.log;
       cat unittest/test-*.xml;
     else
       CTEST_OUTPUT_ON_FAILURE=1 make all test;
     fi
+  - pwd
+  - ls -la unittest
+  - if [ "${MACOSX_PACKAGE}" == "1" ]; then
+      cat unittest/test-*.log;
+      cat unittest/test-*.xml;
+    fi
 
 # Coveralls options: https://github.com/eddyxu/cpp-coveralls/blob/master/README.md
 after_success:

appveyor.yml

@@ -365,8 +365,46 @@ test_script:
   - cmd /c "%test%" & set "test_ret=%ERRORLEVEL%"
   - echo "Test returned %test_ret%"
   - dir "%source_path%\output\build\unittest\"
-  - type "%source_path%\output\build\unittest\test-*.log"
-  - type "%source_path%\output\build\unittest\test-*.xml"
+  - type "%source_path%\output\build\unittest\test-1.log"
+  - type "%source_path%\output\build\unittest\test-1.xml"
+  - type "%source_path%\output\build\unittest\test-2.log"
+  - type "%source_path%\output\build\unittest\test-2.xml"
+  - type "%source_path%\output\build\unittest\test-3.log"
+  - type "%source_path%\output\build\unittest\test-3.xml"
+  - type "%source_path%\output\build\unittest\test-4.log"
+  - type "%source_path%\output\build\unittest\test-4.xml"
+  - type "%source_path%\output\build\unittest\test-5.log"
+  - type "%source_path%\output\build\unittest\test-5.xml"
+  - type "%source_path%\output\build\unittest\test-6.log"
+  - type "%source_path%\output\build\unittest\test-6.xml"
+  - type "%source_path%\output\build\unittest\test-7.log"
+  - type "%source_path%\output\build\unittest\test-7.xml"
+  - type "%source_path%\output\build\unittest\test-8.log"
+  - type "%source_path%\output\build\unittest\test-8.xml"
+  - type "%source_path%\output\build\unittest\test-9.log"
+  - type "%source_path%\output\build\unittest\test-9.xml"
+  - type "%source_path%\output\build\unittest\test-10.log"
+  - type "%source_path%\output\build\unittest\test-10.xml"
+  - type "%source_path%\output\build\unittest\test-11.log"
+  - type "%source_path%\output\build\unittest\test-11.xml"
+  - type "%source_path%\output\build\unittest\test-12.log"
+  - type "%source_path%\output\build\unittest\test-12.xml"
+  - type "%source_path%\output\build\unittest\test-13.log"
+  - type "%source_path%\output\build\unittest\test-13.xml"
+  - type "%source_path%\output\build\unittest\test-14.log"
+  - type "%source_path%\output\build\unittest\test-14.xml"
+  - type "%source_path%\output\build\unittest\test-15.log"
+  - type "%source_path%\output\build\unittest\test-15.xml"
+  - type "%source_path%\output\build\unittest\test-16.log"
+  - type "%source_path%\output\build\unittest\test-16.xml"
+  - type "%source_path%\output\build\unittest\test-17.log"
+  - type "%source_path%\output\build\unittest\test-17.xml"
+  - type "%source_path%\output\build\unittest\test-18.log"
+  - type "%source_path%\output\build\unittest\test-18.xml"
+  - type "%source_path%\output\build\unittest\test-19.log"
+  - type "%source_path%\output\build\unittest\test-19.xml"
+  - type "%source_path%\output\build\unittest\test-20.log"
+  - type "%source_path%\output\build\unittest\test-20.xml"
   - cd "%source_path%"
   - set "output_path=%source_path%\output"
   - set "build_path=%output_path%\build"

unittest/main.c

@@ -19,6 +19,10 @@
  * THE SOFTWARE.
  */
 
+#if defined(_MSC_VER)
+#define _CRT_SECURE_NO_WARNINGS /* Microsoft nonsense */
+#endif
+
 #include "civetweb_check.h"
 #include "shared.h"
 #include "public_func.h"
@@ -107,7 +111,7 @@ main(const int argc, char *argv[])
 	srunner_add_suite(srunner, make_timertest_suite());
 
 	/* Write test logs to a file */
-	if (test_log_prefix != NULL) {
+	if (test_log_prefix == NULL) {
 		/* Find the next free log name */
 		FILE *f;
 		for (i = 1;; i++) {