dankegel · dankegel · May 17, 2020 · May 17, 2020 · May 17, 2020 · May 17, 2020
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -0,0 +1,70 @@
+check_ubu1804_task:
+  container:
+    dockerfile: tooling/cirrus/ubu1804/Dockerfile
+  test_script:
+    - cc --version
+    - mkdir btmp; cd btmp; cmake -G Ninja .. && ninja && ctest -V
+  always:
+    junit_artifacts:
+      path: "btmp/*-results.xml"
+      type: text/xml
+      format: junit
+
+check_ubu2004_task:
+  container:
+    dockerfile: tooling/cirrus/ubu2004/Dockerfile
+  test_script:
+    - cc --version
+    - mkdir btmp; cd btmp; cmake -G Ninja .. && ninja && ctest -V
+  env:
+    - ZLIBTEST_FORCE_FAIL: 1
+  always:
+    junit_artifacts:
+      path: "btmp/*-results.xml"
+      type: text/xml
+      format: junit
+
+check_mac_task:
+  osx_instance:
+    image: catalina-xcode
+  install_script:
+    - brew install ninja
+  test_script:
+    - cc --version
+    - ninja --version
+    - mkdir btmp; cd btmp; cmake -G Ninja .. && cmake --build . && ctest -V
+  always:
+    junit_artifacts:
+      path: "btmp/*-results.xml"
+      type: text/xml
+      format: junit
+
+check_bsd_task:
+  freebsd_instance:
+    image_family: freebsd-12-1
+  install_script:
+    - pkg install -y gcc cmake ninja
+  test_script:
+    - cc --version
+    - mkdir btmp; cd btmp; cmake -G Ninja .. && ninja && ctest -V
+  always:
+    junit_artifacts:
+      path: "btmp/*-results.xml"
+      type: text/xml
+      format: junit
+
+check_win_task:
+  windows_container:
+    image: cirrusci/windowsservercore:cmake
+  install_script:
+    - choco install -y --no-progress ninja
+  test_script:
+    - cmake --version
+    - ninja --version
+    - echo "Setting compiler to MSVC rather than the default (GCC from chocolatey)"
+    - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvars64.bat" && where cl && set CC=cl && mkdir btmp && cd btmp && cmake -G Ninja .. && ninja && ctest -V
+  always:
+    junit_artifacts:
+      path: "btmp/*-results.xml"
+      type: text/xml
+      format: junit
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -232,7 +232,8 @@ endif()
 
 add_executable(example test/example.c)
 target_link_libraries(example zlib)
-add_test(example example)
+# Note: would like to put it in $<CONFIG> subdir, but generator expressions are not expanded as one would expect?
+add_test(example example --junit "${CMAKE_CURRENT_BINARY_DIR}/example-results.xml")
 
 add_executable(minigzip test/minigzip.c)
 target_link_libraries(minigzip zlib)
@@ -241,7 +242,7 @@ if(HAVE_OFF64_T)
     add_executable(example64 test/example.c)
     target_link_libraries(example64 zlib)
     set_target_properties(example64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
-    add_test(example64 example64)
+    add_test(example64 example64 --junit "${CMAKE_CURRENT_BINARY_DIR}/example64-results.xml")
 
     add_executable(minigzip64 test/minigzip.c)
     target_link_libraries(minigzip64 zlib)

diff --git a/README → README.md b/README → README.md
@@ -1,5 +1,7 @@
 ZLIB DATA COMPRESSION LIBRARY
 
+[![AppVeyor CI status][appveyor-shield]][appveyor-link][![Cirrus CI status][cirrus-shield]][cirrus-link]
+
 zlib 1.2.11.1 is a general purpose data compression library.  All the code is
 thread safe.  The data format used by the zlib library is described by RFCs
 (Request for Comments) 1950 to 1952 in the files
@@ -102,8 +104,7 @@ Copyright notice:
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 
-  Jean-loup Gailly        Mark Adler
-  jloup@gzip.org          madler@alumni.caltech.edu
+  Jean-loup Gailly (jloup@gzip.org) & Mark Adler (madler@alumni.caltech.edu)
 
 If you use the zlib library in a product, we would appreciate *not* receiving
 lengthy legal documents to sign.  The sources are provided for free but without
@@ -116,3 +117,9 @@ any third parties.
 If you redistribute modified sources, we would appreciate that you include in
 the file ChangeLog history information documenting your changes.  Please read
 the FAQ for more information on the distribution of modified source versions.
+
+<!-- fix following four lines when merging -->
+[appveyor-shield]: https://ci.appveyor.com/api/projects/status/h80iqyhbe09p29n0/branch/develop?svg=true
+[appveyor-link]: https://ci.appveyor.com/project/dankegel/zlib/branch/develop
+[cirrus-shield]: https://api.cirrus-ci.com/github/dankegel/zlib.svg?branch=develop
+[cirrus-link]: https://cirrus-ci.com/github/dankegel/zlib/develop