浏览代码

Print what version of the check framework is used for the unit test

The "check" unit test framework did not build for FreeBSD, due to some missing headers.
We added the headers to https://github.com/civetweb/check, but the CivetWeb unit test
on Travis CI still returns the same "missing headers" error than before.
Maybe we do not use the correct version in the unit test?
Maybe it uses the root version libcheck/check, due to some environment variable set on
Travis CI?
Remove references to libcheck/check and print the version used in the CI test.

It seems the Travis CI test i
bel2125 3 年之前
父节点
当前提交
167a871684
共有 3 个文件被更改,包括 3 次插入13 次删除
  1. 2 7
      unittest/CMakeLists.txt
  2. 1 3
      unittest/civetweb_check.h
  3. 0 3
      unittest/main.c

+ 2 - 7
unittest/CMakeLists.txt

@@ -17,13 +17,8 @@ ENDIF()
 ExternalProject_Add(check-unit-test-framework
   DEPENDS civetweb-c-library
 
-## Use an official, released check version:
-#  URL "https://codeload.github.com/libcheck/check/zip/${CIVETWEB_CHECK_VERSION}"
-#  DOWNLOAD_NAME "${CIVETWEB_CHECK_VERSION}.zip"
-#  URL_MD5 ${CIVETWEB_CHECK_MD5_HASH}
-
-## Use a civetweb specific patched version
-
+## Print what version of the CHECK unit test framework we are using
+message(STATUS "Using check unit test framework:\n ${CHECK_URL}\n")
 URL ${CHECK_URL}
 DOWNLOAD_NAME "master.zip"
 

+ 1 - 3
unittest/civetweb_check.h

@@ -50,9 +50,7 @@
 #endif
 #include <stdint.h>
 
-/* All unit tests use the "check" framework.
- * Download from https://libcheck.github.io/check/
- */
+/* All unit tests use the "check" unit test framework. */
 #include "check.h"
 
 #if (CHECK_MINOR_VERSION < 11)

+ 0 - 3
unittest/main.c

@@ -41,9 +41,6 @@
  *
  * Note: CivetWeb is tested using it's own fork of check:
  * https://github.com/civetweb/check
- * Required fixes from this fork are already available
- * in the main repository:
- * https://github.com/libcheck/check
  */
 
 #define FILENAME_LEN (128)