From eb3d0a4fa925d6918a0edf792fb76c07c0a02b73 Mon Sep 17 00:00:00 2001 From: brane Date: Wed, 6 May 2020 16:14:55 +0000 Subject: testdir: Following up to r1877439, make sure that the test data gets populated correctly when threads are disabled. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@1877443 13f79535-47bb-0310-9956-ffa450edef68 --- test/testdir.c | 45 ++++++++++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/test/testdir.c b/test/testdir.c index 3ad4ba0ce..db8d1bc06 100644 --- a/test/testdir.c +++ b/test/testdir.c @@ -63,39 +63,44 @@ 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 +static void mkdir_func(abts_case *tc, apr_pool_t *pool) { - abts_case *tc; - apr_pool_t *pool; -}; - -static void *APR_THREAD_FUNC thread_mkdir_func(apr_thread_t *thd, void *data) -{ - struct thread_data *td = data; apr_status_t s1, s2, s3, s4, s5; s1 = apr_dir_make_recursive("data/prll/one/thwo/three", APR_FPROT_UREAD | APR_FPROT_UWRITE | APR_FPROT_UEXECUTE, - td->pool); + pool); s2 = apr_dir_make_recursive("data/prll/four/five/six/seven/eight", APR_FPROT_UREAD | APR_FPROT_UWRITE | APR_FPROT_UEXECUTE, - td->pool); + pool); s3 = apr_dir_make_recursive("data/prll/nine/ten", APR_FPROT_UREAD | APR_FPROT_UWRITE | APR_FPROT_UEXECUTE, - td->pool); + pool); s4 = apr_dir_make_recursive("data/prll/11/12/13/14/15/16/17/18/19/20", APR_FPROT_UREAD | APR_FPROT_UWRITE | APR_FPROT_UEXECUTE, - td->pool); + pool); s5 = apr_dir_make_recursive("data/fortytwo", APR_FPROT_UREAD | APR_FPROT_UWRITE | APR_FPROT_UEXECUTE, - td->pool); + pool); - ABTS_INT_EQUAL(td->tc, APR_SUCCESS, s1); - ABTS_INT_EQUAL(td->tc, APR_SUCCESS, s2); - ABTS_INT_EQUAL(td->tc, APR_SUCCESS, s3); - ABTS_INT_EQUAL(td->tc, APR_SUCCESS, s4); - ABTS_INT_EQUAL(td->tc, APR_SUCCESS, s5); + ABTS_INT_EQUAL(tc, APR_SUCCESS, s1); + ABTS_INT_EQUAL(tc, APR_SUCCESS, s2); + ABTS_INT_EQUAL(tc, APR_SUCCESS, s3); + ABTS_INT_EQUAL(tc, APR_SUCCESS, s4); + ABTS_INT_EQUAL(tc, APR_SUCCESS, s5); +} + +#if APR_HAS_THREADS +struct thread_data +{ + abts_case *tc; + apr_pool_t *pool; +}; + +static void *APR_THREAD_FUNC thread_mkdir_func(apr_thread_t *thd, void *data) +{ + struct thread_data *td = data; + mkdir_func(td->tc, td->pool); return NULL; } #endif /* APR_HAS_THREADS */ @@ -132,6 +137,8 @@ static void test_mkdir_recurs_parallel(abts_case *tc, void *data) ABTS_INT_EQUAL(tc, APR_SUCCESS, s3); ABTS_INT_EQUAL(tc, APR_SUCCESS, s4); #else + /* Create the test directories for test_removeall anwyay. */ + mkdir_func(tc, p); ABTS_SKIP(tc, data, "This test requires APR thread support."); #endif /* APR_HAS_THREADS */ } -- cgit v1.2.1