diff options
| author | brane <brane@13f79535-47bb-0310-9956-ffa450edef68> | 2020-05-06 14:57:22 +0000 |
|---|---|---|
| committer | brane <brane@13f79535-47bb-0310-9956-ffa450edef68> | 2020-05-06 14:57:22 +0000 |
| commit | d304f14fb8959d73afae35670136c87bf248fae6 (patch) | |
| tree | 8fa61d08ce3a485eecf822c574ae518c98eae53f | |
| parent | a4d7b2085286b9367dc4795106905a8cd624dd73 (diff) | |
| download | libapr-d304f14fb8959d73afae35670136c87bf248fae6.tar.gz | |
Make test work with thread support disabled.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@1877439 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | test/testdir.c | 7 | ||||
| -rw-r--r-- | test/testfile.c | 7 |
2 files changed, 14 insertions, 0 deletions
diff --git a/test/testdir.c b/test/testdir.c index 21876be5d..cdb19f3e8 100644 --- a/test/testdir.c +++ b/test/testdir.c @@ -63,6 +63,7 @@ static void test_mkdir_recurs(abts_case *tc, void *data) ABTS_INT_EQUAL(tc, APR_DIR, finfo.filetype); } +#if APR_HAS_THREADS struct thread_data { abts_case *tc; @@ -97,9 +98,11 @@ static void *APR_THREAD_FUNC thread_mkdir_func(apr_thread_t *thd, void *data) ABTS_INT_EQUAL(td->tc, APR_SUCCESS, s5); return NULL; } +#endif /* APR_HAS_THREADS */ static void test_mkdir_recurs_parallel(abts_case *tc, void *data) { +#if APR_HAS_THREADS struct thread_data td1, td2, td3, td4; apr_thread_t *t1, *t2, *t3, *t4; apr_status_t s1, s2, s3, s4; @@ -128,6 +131,10 @@ static void test_mkdir_recurs_parallel(abts_case *tc, void *data) ABTS_INT_EQUAL(tc, APR_SUCCESS, s2); ABTS_INT_EQUAL(tc, APR_SUCCESS, s3); ABTS_INT_EQUAL(tc, APR_SUCCESS, s4); +#else + (void)tc; + (void)data; +#endif /* APR_HAS_THREADS */ } static void test_remove(abts_case *tc, void *data) diff --git a/test/testfile.c b/test/testfile.c index 7493047b7..e18e4d121 100644 --- a/test/testfile.c +++ b/test/testfile.c @@ -1630,6 +1630,7 @@ static void test_write_buffered_spanning_over_bufsize(abts_case *tc, void *data) apr_file_remove(fname, p); } +#if APR_HAS_THREADS typedef struct thread_file_append_ctx_t { apr_pool_t *pool; const char *fname; @@ -1698,9 +1699,11 @@ static void * APR_THREAD_FUNC thread_file_append_func(apr_thread_t *thd, void *d return NULL; } +#endif /* APR_HAS_THREADS */ static void test_atomic_append(abts_case *tc, void *data) { +#if APR_HAS_THREADS apr_status_t rv; apr_status_t thread_rv; apr_file_t *f; @@ -1753,6 +1756,10 @@ static void test_atomic_append(abts_case *tc, void *data) } apr_file_remove(fname, p); +#else + (void)tc; + (void)data; +#endif /* APR_HAS_THREADS */ } static void test_append_locked(abts_case *tc, void *data) |