diff options
| author | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2007-10-06 22:44:46 +0000 |
|---|---|---|
| committer | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2007-10-06 22:44:46 +0000 |
| commit | e1a67b956ca2c7901363fd055316e29fbecd729d (patch) | |
| tree | 045da0e709d3f7c13e428eb532e17ca325a57837 /test/testsock.c | |
| parent | c12d05054d23437805c07530f15952dbeb462578 (diff) | |
| download | libapr-e1a67b956ca2c7901363fd055316e29fbecd729d.tar.gz | |
Solve two sets of issues, only two possible changes, in one
batch commit;
* P64 architectures require us to use ABTS_SIZE_EQUAL
* We need to localize to TESTBINPATH for win32
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@582544 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'test/testsock.c')
| -rw-r--r-- | test/testsock.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/testsock.c b/test/testsock.c index 5c83d68c0..343dbd36e 100644 --- a/test/testsock.c +++ b/test/testsock.c @@ -43,7 +43,7 @@ static void launch_child(abts_case *tc, apr_proc_t *proc, const char *arg1, apr_ args[0] = "sockchild" EXTENSION; args[1] = arg1; args[2] = NULL; - rv = apr_proc_create(proc, "./sockchild" EXTENSION, args, NULL, + rv = apr_proc_create(proc, TESTBINPATH "sockchild" EXTENSION, args, NULL, procattr, p); APR_ASSERT_SUCCESS(tc, "Couldn't launch program", rv); } @@ -133,7 +133,7 @@ static void test_send(abts_case *tc, void *data) apr_socket_send(sock2, DATASTR, &length); /* Make sure that the client received the data we sent */ - ABTS_INT_EQUAL(tc, strlen(DATASTR), wait_child(tc, &proc)); + ABTS_SIZE_EQUAL(tc, strlen(DATASTR), wait_child(tc, &proc)); rv = apr_socket_close(sock2); APR_ASSERT_SUCCESS(tc, "Problem closing connected socket", rv); @@ -167,7 +167,7 @@ static void test_recv(abts_case *tc, void *data) /* Make sure that the server received the data we sent */ ABTS_STR_EQUAL(tc, DATASTR, datastr); - ABTS_INT_EQUAL(tc, strlen(datastr), wait_child(tc, &proc)); + ABTS_SIZE_EQUAL(tc, strlen(datastr), wait_child(tc, &proc)); rv = apr_socket_close(sock2); APR_ASSERT_SUCCESS(tc, "Problem closing connected socket", rv); |