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/testfilecopy.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/testfilecopy.c')
| -rw-r--r-- | test/testfilecopy.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/test/testfilecopy.c b/test/testfilecopy.c index 7db0b2082..21db4bcac 100644 --- a/test/testfilecopy.c +++ b/test/testfilecopy.c @@ -36,13 +36,13 @@ static void copy_helper(abts_case *tc, const char *from, const char * to, else { rv = apr_file_append(from, to, perms, p); } - apr_assert_success(tc, "Error copying file", rv); + APR_ASSERT_SUCCESS(tc, "Error copying file", rv); rv = apr_stat(&orig, from, APR_FINFO_SIZE, p); - apr_assert_success(tc, "Couldn't stat original file", rv); + APR_ASSERT_SUCCESS(tc, "Couldn't stat original file", rv); rv = apr_stat(©, to, APR_FINFO_SIZE, p); - apr_assert_success(tc, "Couldn't stat copy file", rv); + APR_ASSERT_SUCCESS(tc, "Couldn't stat copy file", rv); if (!append) { ABTS_INT_EQUAL(tc, orig.size, copy.size); @@ -64,7 +64,7 @@ static void copy_short_file(abts_case *tc, void *data) copy_helper(tc, "data/file_datafile.txt", "data/file_copy.txt", APR_FILE_SOURCE_PERMS, 0, p); rv = apr_file_remove("data/file_copy.txt", p); - apr_assert_success(tc, "Couldn't remove copy file", rv); + APR_ASSERT_SUCCESS(tc, "Couldn't remove copy file", rv); } static void copy_over_existing(abts_case *tc, void *data) @@ -85,7 +85,7 @@ static void copy_over_existing(abts_case *tc, void *data) APR_FILE_SOURCE_PERMS, 0, p); rv = apr_file_remove("data/file_copy.txt", p); - apr_assert_success(tc, "Couldn't remove copy file", rv); + APR_ASSERT_SUCCESS(tc, "Couldn't remove copy file", rv); } static void append_nonexist(abts_case *tc, void *data) @@ -98,7 +98,7 @@ static void append_nonexist(abts_case *tc, void *data) copy_helper(tc, "data/file_datafile.txt", "data/file_copy.txt", APR_FILE_SOURCE_PERMS, 0, p); rv = apr_file_remove("data/file_copy.txt", p); - apr_assert_success(tc, "Couldn't remove copy file", rv); + APR_ASSERT_SUCCESS(tc, "Couldn't remove copy file", rv); } static void append_exist(abts_case *tc, void *data) @@ -119,7 +119,7 @@ static void append_exist(abts_case *tc, void *data) APR_FILE_SOURCE_PERMS, 1, p); rv = apr_file_remove("data/file_copy.txt", p); - apr_assert_success(tc, "Couldn't remove copy file", rv); + APR_ASSERT_SUCCESS(tc, "Couldn't remove copy file", rv); } abts_suite *testfilecopy(abts_suite *suite) |