summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorjerenkrantz <jerenkrantz@13f79535-47bb-0310-9956-ffa450edef68>2004-07-06 03:38:06 +0000
committerjerenkrantz <jerenkrantz@13f79535-47bb-0310-9956-ffa450edef68>2004-07-06 03:38:06 +0000
commited50c6808732eda6b7f2f38b7a8c12ec1dbf54da (patch)
treeee0d1f82e772eeebcb35be3d8facf31cc71ddeea /test
parent28ea8f9797661041451c560ef5c70b394d917ad7 (diff)
downloadlibapr-ed50c6808732eda6b7f2f38b7a8c12ec1dbf54da.tar.gz
Add support for KQueue and sys_epoll to apr_pollset.
(Justin tweaked the cleanup code from Paul's last posted patch.) Submitted by: Paul Querna Reviewed by: Justin Erenkrantz, Joe Orton git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@65261 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'test')
-rw-r--r--test/testpoll.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/test/testpoll.c b/test/testpoll.c
index 23a824dbd..690884a91 100644
--- a/test/testpoll.c
+++ b/test/testpoll.c
@@ -489,10 +489,14 @@ static void pollset_remove(abts_case *tc, void *data)
rv = apr_pollset_poll(pollset, 1000, &num, &hot_files);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
ABTS_INT_EQUAL(tc, 2, num);
- ABTS_PTR_EQUAL(tc, (void *)1, hot_files[0].client_data);
- ABTS_PTR_EQUAL(tc, s[0], hot_files[0].desc.s);
- ABTS_PTR_EQUAL(tc, (void *)4, hot_files[1].client_data);
- ABTS_PTR_EQUAL(tc, s[3], hot_files[1].desc.s);
+ ABTS_ASSERT(tc, "Incorrect socket in result set",
+ ((hot_files[0].desc.s == s[0]) && (hot_files[1].desc.s == s[3])) ||
+ ((hot_files[0].desc.s == s[3]) && (hot_files[1].desc.s == s[0])));
+ ABTS_ASSERT(tc, "Incorrect client data in result set",
+ ((hot_files[0].client_data == (void *)1) &&
+ (hot_files[1].client_data == (void *)4)) ||
+ ((hot_files[0].client_data == (void *)4) &&
+ (hot_files[1].client_data == (void *)1)));
}
abts_suite *testpoll(abts_suite *suite)