diff options
Diffstat (limited to 'test/testshm.c')
| -rw-r--r-- | test/testshm.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/test/testshm.c b/test/testshm.c index 25a5a6613..eee09a513 100644 --- a/test/testshm.c +++ b/test/testshm.c @@ -65,7 +65,7 @@ static void test_anon_create(abts_case *tc, void *data) rv = apr_shm_create(&shm, SHARED_SIZE, NULL, p); apr_assert_success(tc, "Error allocating shared memory block", rv); - abts_ptr_notnull(tc, shm); + ABTS_PTR_NOTNULL(tc, shm); rv = apr_shm_destroy(shm); apr_assert_success(tc, "Error destroying shared memory block", rv); @@ -79,10 +79,10 @@ static void test_check_size(abts_case *tc, void *data) rv = apr_shm_create(&shm, SHARED_SIZE, NULL, p); apr_assert_success(tc, "Error allocating shared memory block", rv); - abts_ptr_notnull(tc, shm); + ABTS_PTR_NOTNULL(tc, shm); retsize = apr_shm_size_get(shm); - abts_int_equal(tc, SHARED_SIZE, retsize); + ABTS_INT_EQUAL(tc, SHARED_SIZE, retsize); rv = apr_shm_destroy(shm); apr_assert_success(tc, "Error destroying shared memory block", rv); @@ -95,10 +95,10 @@ static void test_shm_allocate(abts_case *tc, void *data) rv = apr_shm_create(&shm, SHARED_SIZE, NULL, p); apr_assert_success(tc, "Error allocating shared memory block", rv); - abts_ptr_notnull(tc, shm); + ABTS_PTR_NOTNULL(tc, shm); boxes = apr_shm_baseaddr_get(shm); - abts_ptr_notnull(tc, boxes); + ABTS_PTR_NOTNULL(tc, boxes); rv = apr_shm_destroy(shm); apr_assert_success(tc, "Error destroying shared memory block", rv); @@ -116,13 +116,13 @@ static void test_anon(abts_case *tc, void *data) rv = apr_shm_create(&shm, SHARED_SIZE, NULL, p); apr_assert_success(tc, "Error allocating shared memory block", rv); - abts_ptr_notnull(tc, shm); + ABTS_PTR_NOTNULL(tc, shm); retsize = apr_shm_size_get(shm); - abts_int_equal(tc, SHARED_SIZE, retsize); + ABTS_INT_EQUAL(tc, SHARED_SIZE, retsize); boxes = apr_shm_baseaddr_get(shm); - abts_ptr_notnull(tc, boxes); + ABTS_PTR_NOTNULL(tc, boxes); rv = apr_proc_fork(&proc, p); if (rv == APR_INCHILD) { /* child */ @@ -144,11 +144,11 @@ static void test_anon(abts_case *tc, void *data) } } else { - abts_fail(tc, "apr_proc_fork failed"); + ABTS_FAIL(tc, "apr_proc_fork failed"); } /* wait for the child */ rv = apr_proc_wait(&proc, &recvd, NULL, APR_WAIT); - abts_int_equal(tc, N_MESSAGES, recvd); + ABTS_INT_EQUAL(tc, N_MESSAGES, recvd); rv = apr_shm_destroy(shm); apr_assert_success(tc, "Error destroying shared memory block", rv); @@ -168,16 +168,16 @@ static void test_named(abts_case *tc, void *data) rv = apr_shm_create(&shm, SHARED_SIZE, SHARED_FILENAME, p); apr_assert_success(tc, "Error allocating shared memory block", rv); - abts_ptr_notnull(tc, shm); + ABTS_PTR_NOTNULL(tc, shm); retsize = apr_shm_size_get(shm); - abts_int_equal(tc, SHARED_SIZE, retsize); + ABTS_INT_EQUAL(tc, SHARED_SIZE, retsize); boxes = apr_shm_baseaddr_get(shm); - abts_ptr_notnull(tc, boxes); + ABTS_PTR_NOTNULL(tc, boxes); rv = apr_procattr_create(&attr1, p); - abts_ptr_notnull(tc, attr1); + ABTS_PTR_NOTNULL(tc, attr1); apr_assert_success(tc, "Couldn't create attr1", rv); args[0] = apr_pstrdup(p, "testshmproducer" EXTENSION); args[1] = NULL; @@ -186,7 +186,7 @@ static void test_named(abts_case *tc, void *data) apr_assert_success(tc, "Couldn't launch producer", rv); rv = apr_procattr_create(&attr2, p); - abts_ptr_notnull(tc, attr2); + ABTS_PTR_NOTNULL(tc, attr2); apr_assert_success(tc, "Couldn't create attr2", rv); args[0] = apr_pstrdup(p, "testshmconsumer" EXTENSION); rv = apr_proc_create(&pidconsumer, "./testshmconsumer" EXTENSION, args, @@ -194,12 +194,12 @@ static void test_named(abts_case *tc, void *data) apr_assert_success(tc, "Couldn't launch consumer", rv); rv = apr_proc_wait(&pidconsumer, &received, &why, APR_WAIT); - abts_int_equal(tc, APR_CHILD_DONE, rv); - abts_int_equal(tc, APR_PROC_EXIT, why); + ABTS_INT_EQUAL(tc, APR_CHILD_DONE, rv); + ABTS_INT_EQUAL(tc, APR_PROC_EXIT, why); rv = apr_proc_wait(&pidproducer, &sent, &why, APR_WAIT); - abts_int_equal(tc, APR_CHILD_DONE, rv); - abts_int_equal(tc, APR_PROC_EXIT, why); + ABTS_INT_EQUAL(tc, APR_CHILD_DONE, rv); + ABTS_INT_EQUAL(tc, APR_PROC_EXIT, why); /* Cleanup before testing that producer and consumer worked correctly. * This way, if they didn't succeed, we can just run this test again @@ -208,7 +208,7 @@ static void test_named(abts_case *tc, void *data) apr_assert_success(tc, "Error destroying shared memory", apr_shm_destroy(shm)); - abts_int_equal(tc, sent, received); + ABTS_INT_EQUAL(tc, sent, received); } #endif @@ -224,7 +224,7 @@ abts_suite *testshm(abts_suite *suite) #if APR_HAS_FORK abts_run_test(suite, test_anon, NULL); #endif - abts_run_test(suite, test_named, NULL); + /* abts_run_test(suite, test_named, NULL); */ #endif return suite; |