Do not compile the serf_spider test program if APR doesn't support threads.

* build/scons_extras.py
  (CheckAPRHasThreads): New custom test function.
* SConstruct
  (custom_tests): Add CheckAPRHasThreads.
  (apr_has_threads): Perform the config test.
  (TEST_PROGRAMS): Add serf_spider only if APR has threads.

* test/CMakeLists.txt
  (serf_check_apr_has_threads): New test function.
  (SIMPLE_TEST_TARGETS): Add serf_spider only if APR has threads.
* CMakeLists.txt: Add a note to the summary if APR doesn't have threads.


git-svn-id: https://svn.apache.org/repos/asf/serf/trunk@1931481 13f79535-47bb-0310-9956-ffa450edef68

Author: brainy

CMakeLists.txt

@@ -635,6 +635,12 @@ if(DOT_CLANGD)
   set(_gen_dot_clangd ON)
 endif()
 
+if(APR_HAS_THREADS)
+  set(_apr_version "${APR_VERSION}")
+else()
+  set(_apr_version "${APR_VERSION} [no threads]")
+endif()
+
 if("SERF_HAVE_BROTLI" IN_LIST SERF_C_DEFINES)
   set(_have_brotli ON)
   if(NOT SERF_WINDOWS)
@@ -684,7 +690,7 @@ message(STATUS "    GSSAPI .................. : ${_have_gssapi}")
 message(STATUS "    SSPI .................... : ${_have_sspi}")
 message(STATUS "    Unbound ................. : ${_have_unbound}")
 message(STATUS "  Dependencies:")
-message(STATUS "    APR ..................... : ${APR_VERSION}")
+message(STATUS "    APR ..................... : ${_apr_version}")
 if(APR_VERSION VERSION_LESS 2.0.0)
 message(STATUS "    APR-Util ................ : ${APRUTIL_VERSION}")
 endif()

SConstruct

@@ -43,7 +43,8 @@ import build.scons_extras
 import build.exports
 
 build.scons_extras.AddEnvironmentMethods()
-custom_tests = {'CheckGnuCC': build.scons_extras.CheckGnuCC}
+custom_tests = {'CheckGnuCC': build.scons_extras.CheckGnuCC,
+                'CheckAPRHasThreads': build.scons_extras.CheckAPRHasThreads}
 
 # SCons 4.7 introduced the function argument list parameter to CheckFunc.
 try:
@@ -650,6 +651,7 @@ for line in stream.readlines():
 ssl_includes = '\n'.join(ssl_include_list)
 
 conf = Configure(env, custom_tests=custom_tests)
+apr_has_threads = conf.CheckAPRHasThreads()
 if not conf.CheckFunc('BIO_set_init', ssl_includes, 'C', 'NULL, 0'):
   env.Append(CPPDEFINES=['SERF_NO_SSL_BIO_WRAPPERS'])
 if not conf.CheckFunc('X509_STORE_get0_param', ssl_includes, 'C', 'NULL'):
@@ -830,11 +832,18 @@ mockhttpinc = mockenv.StaticLibrary('mockhttpinc',
 
 # Check if long-running tests should be enabled
 if tenv.get('ENABLE_SLOW_TESTS', None):
-    tenv.Append(CPPDEFINES=['SERF_TEST_DEFLATE_4GBPLUS_BUCKETS'])
-
-TEST_PROGRAMS = [ 'serf_get', 'serf_response', 'serf_request', 'serf_spider',
-                  'serf_httpd',
-                  'test_all', 'serf_bwtp' ]
+  tenv.Append(CPPDEFINES=['SERF_TEST_DEFLATE_4GBPLUS_BUCKETS'])
+
+TEST_PROGRAMS = [
+    'serf_get',
+    'serf_response',
+    'serf_request',
+    'serf_httpd',
+    'test_all',
+    'serf_bwtp',
+    ]
+if apr_has_threads:
+  TEST_PROGRAMS.append("serf_spider")
 
 _exe = '.exe' if sys.platform == 'win32' else ''
 TEST_EXES = [os.path.join('test', '%s%s' % (prog, _exe)) for prog in TEST_PROGRAMS]

build/scons_extras.py

@@ -41,6 +41,22 @@ def CheckGnuCC(context):
   return result
 
 
+def CheckAPRHasThreads(context):
+  '''Check if APR_HAS_THREADS is defined'''
+
+  src = '''
+#include <apr.h>
+#if !APR_HAS_THREADS
+oh noes!
+#endif
+'''
+
+  context.Display('Checking for thread support in APR... ')
+  result = context.TryCompile(src, '.c')
+  context.Result(result)
+  return result
+
+
 def __env_munge_if(env, method, variables, pattern, **kwargs):
   '''Invoke `env`.`method`(**`kwargs`), unless `pattern` matches the
    values in `variables` that are also in `env`.

test/CMakeLists.txt

@@ -17,6 +17,29 @@
 #   under the License.
 # ===================================================================
 
+include(CheckCSourceCompiles)
+
+# Check if APR has threads, serf_spider doesn't compile otherwise.
+function(serf_check_apr_has_threads)
+  set(CMAKE_REQUIRED_LIBRARIES APR::APR)
+  set(source
+      "#include <apr.h>"
+      "#if !APR_HAS_THREADS"
+      "#error \"no threads\""
+      "#endif"
+      "int main(void) { return 0\; }"
+      "")
+  list(JOIN source "\n" source)
+  check_c_source_compiles("${source}" "APR_HAS_THREADS")
+  if(APR_HAS_THREADS)
+    set(APR_HAS_THREADS TRUE PARENT_SCOPE)
+  else()
+    set(APR_HAS_THREADS FALSE PARENT_SCOPE)
+  endif()
+  unset(CMAKE_REQUIRED_LIBRARIES)
+endfunction(serf_check_apr_has_threads)
+serf_check_apr_has_threads()
+
 add_subdirectory(MockHTTPinC)
 
 set(TEST_ALL_SOURCES
@@ -46,10 +69,14 @@ set(SIMPLE_TEST_TARGETS
     "serf_get"
     "serf_response"
     "serf_request"
-    "serf_spider"
     "serf_httpd"
     "serf_bwtp"
 )
+if(APR_HAS_THREADS)
+  list(APPEND SIMPLE_TEST_TARGETS "serf_spider")
+else()
+  message(STATUS "Test program serf_spider will not be built (requires APR_HAS_THREADS)")
+endif()
 
 foreach(TEST_TARGET ${SIMPLE_TEST_TARGETS})
   add_executable(${TEST_TARGET} "${TEST_TARGET}.c")