diff options
| -rw-r--r-- | test/testfile.c | 3 | ||||
| -rw-r--r-- | test/testlockperf.c | 6 | ||||
| -rw-r--r-- | test/testmemcache.c | 3 | ||||
| -rw-r--r-- | test/testmmap.c | 1 |
4 files changed, 6 insertions, 7 deletions
diff --git a/test/testfile.c b/test/testfile.c index dad214e35..fa494a293 100644 --- a/test/testfile.c +++ b/test/testfile.c @@ -749,6 +749,7 @@ static void test_writev_buffered_seek(abts_case *tc, void *data) APR_OS_DEFAULT, p)); rv = apr_file_read(f, str, &nbytes); + ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); ABTS_STR_EQUAL(tc, TESTSTR, str); APR_ASSERT_SUCCESS(tc, "buffered seek", apr_file_seek(f, APR_SET, &off)); @@ -1006,6 +1007,7 @@ static void test_xthread(abts_case *tc, void *data) apr_off_t offset = 0; rv = apr_file_seek(f, APR_END, &offset); + ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); } APR_ASSERT_SUCCESS(tc, "more writes should succeed", @@ -1016,6 +1018,7 @@ static void test_xthread(abts_case *tc, void *data) apr_off_t offset = 0; rv = apr_file_seek(f, APR_SET, &offset); + ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); } apr_file_read_full(f, buf, sizeof(buf), NULL); diff --git a/test/testlockperf.c b/test/testlockperf.c index f673e5f7b..84c0ba991 100644 --- a/test/testlockperf.c +++ b/test/testlockperf.c @@ -226,7 +226,6 @@ int main(int argc, const char * const *argv) { apr_status_t rv; char errmsg[200]; - const char *lockname = "multi.lock"; apr_getopt_t *opt; char optchar; const char *optarg; @@ -245,13 +244,10 @@ int main(int argc, const char * const *argv) exit(-1); } - while ((rv = apr_getopt(opt, "vf:", &optchar, &optarg)) == APR_SUCCESS) { + while ((rv = apr_getopt(opt, "v", &optchar, &optarg)) == APR_SUCCESS) { if (optchar == 'v') { verbose = 1; } - if (optchar == 'f') { - lockname = optarg; - } } if (rv != APR_SUCCESS && rv != APR_EOF) { diff --git a/test/testmemcache.c b/test/testmemcache.c index 0bd7f189b..374238828 100644 --- a/test/testmemcache.c +++ b/test/testmemcache.c @@ -488,7 +488,7 @@ static void test_memcache_setget(abts_case * tc, void *data) apr_status_t rv; apr_memcache_t *memcache; apr_memcache_server_t *server; - apr_hash_t *tdata, *values; + apr_hash_t *tdata; apr_hash_index_t *hi; char *result; apr_size_t len; @@ -503,7 +503,6 @@ static void test_memcache_setget(abts_case * tc, void *data) ABTS_ASSERT(tc, "server add failed", rv == APR_SUCCESS); tdata = apr_hash_make(pool); - values = apr_hash_make(pool); create_test_hash(pool, tdata); diff --git a/test/testmmap.c b/test/testmmap.c index 4063ba62e..74c0c9f50 100644 --- a/test/testmmap.c +++ b/test/testmmap.c @@ -125,6 +125,7 @@ static void test_mmap_offset(abts_case *tc, void *data) ABTS_PTR_NOTNULL(tc, themmap); rv = apr_mmap_offset(&addr, themmap, 5); + ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); /* Must use nEquals since the string is not guaranteed to be NULL terminated */ ABTS_STR_NEQUAL(tc, addr, TEST_STRING + 5, thisfsize-5); } |