diff options
author | dreid <dreid@13f79535-47bb-0310-9956-ffa450edef68> | 2004-06-07 21:21:35 +0000 |
---|---|---|
committer | dreid <dreid@13f79535-47bb-0310-9956-ffa450edef68> | 2004-06-07 21:21:35 +0000 |
commit | a9ba3b84bee7872b82dc38e6f4ded710b2f65c8a (patch) | |
tree | 6b948a49808b3ef086fbcd00ff9fb4207df836b1 /test/testglobalmutex.c | |
parent | e519c61cf1cd50ccf8f4c2561a4295299a2d89a8 (diff) | |
download | libapr-a9ba3b84bee7872b82dc38e6f4ded710b2f65c8a.tar.gz |
Presently if we fail in apr_assert_success we get the line number for
testutil.c reported. Not very useful. This change adds the passing of
the (correct) line number and also a macro to ease said passing.
I've changed all instances of apr_assert_success to use the new macro, but
not all the tests build on this platform so others should check that all
is well for them.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@65171 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'test/testglobalmutex.c')
-rw-r--r-- | test/testglobalmutex.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/testglobalmutex.c b/test/testglobalmutex.c index bebcb20ac..dc79848a7 100644 --- a/test/testglobalmutex.c +++ b/test/testglobalmutex.c @@ -28,21 +28,21 @@ static void launch_child(abts_case *tc, apr_lockmech_e mech, apr_status_t rv; rv = apr_procattr_create(&procattr, p); - apr_assert_success(tc, "Couldn't create procattr", rv); + APR_ASSERT_SUCCESS(tc, "Couldn't create procattr", rv); rv = apr_procattr_io_set(procattr, APR_NO_PIPE, APR_NO_PIPE, APR_NO_PIPE); - apr_assert_success(tc, "Couldn't set io in procattr", rv); + APR_ASSERT_SUCCESS(tc, "Couldn't set io in procattr", rv); rv = apr_procattr_error_check_set(procattr, 1); - apr_assert_success(tc, "Couldn't set error check in procattr", rv); + APR_ASSERT_SUCCESS(tc, "Couldn't set error check in procattr", rv); args[0] = "globalmutexchild" EXTENSION; args[1] = (const char*)apr_itoa(p, (int)mech); args[2] = NULL; rv = apr_proc_create(proc, "./globalmutexchild" EXTENSION, args, NULL, procattr, p); - apr_assert_success(tc, "Couldn't launch program", rv); + APR_ASSERT_SUCCESS(tc, "Couldn't launch program", rv); } static int wait_child(abts_case *tc, apr_proc_t *proc) @@ -79,7 +79,7 @@ static void test_exclusive(abts_case *tc, void *data, apr_lockmech_e mech) int x = 0; rv = apr_global_mutex_create(&global_lock, LOCKNAME, mech, p); - apr_assert_success(tc, "Error creating mutex", rv); + APR_ASSERT_SUCCESS(tc, "Error creating mutex", rv); launch_child(tc, mech, &p1, p); launch_child(tc, mech, &p2, p); |