summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Trawick <trawick@apache.org>2007-11-18 19:35:15 +0000
committerJeff Trawick <trawick@apache.org>2007-11-18 19:35:15 +0000
commit9323815115aca84797f54cf2edaf92f69a3e9041 (patch)
tree92389a46138e371a111ffd8c952ee967fb8b002f
parent34a6b61752058a9e064960664fe340b180ebbc94 (diff)
downloadapr-9323815115aca84797f54cf2edaf92f69a3e9041.tar.gz
grab r596027 from trunk since it fixes a broken
test check that the library function succeeded, not that APR_SUCCESS == 0 git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.2.x@596120 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--test/testnames.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/testnames.c b/test/testnames.c
index a96a9b2f4..06c51bbbd 100644
--- a/test/testnames.c
+++ b/test/testnames.c
@@ -78,7 +78,7 @@ static void merge_dotdot(abts_case *tc, void *data)
ABTS_STR_EQUAL(tc, ABS_ROOT"foo/baz", dstpath);
rv = apr_filepath_merge(&dstpath, "", "../test", 0, p);
- ABTS_INT_EQUAL(tc, 0, APR_SUCCESS);
+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
ABTS_STR_EQUAL(tc, "../test", dstpath);
/* Very dangerous assumptions here about what the cwd is. However, let's assume
@@ -87,7 +87,7 @@ static void merge_dotdot(abts_case *tc, void *data)
* the case of the test directory:
*/
rv = apr_filepath_merge(&dstpath, "", "../test", APR_FILEPATH_TRUENAME, p);
- ABTS_INT_EQUAL(tc, 0, APR_SUCCESS);
+ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
ABTS_STR_EQUAL(tc, "../test", dstpath);
}