Fix the isc_rwlock_tryupgrade() function's unit test

The pthread-based implementation of the isc_rwlock_tryupgrade()
function always returns ISC_R_LOCKBUSY. Fix the test by adding
conditional checks.

diff --git a/tests/isc/rwlock_test.c b/tests/isc/rwlock_test.c
index 74f9e4ca22af3cb08719523bb0c8fff1f27c8c3a..893f8cfc4d47ea22f1301b8639a46e82437740b1 100644 (file)
--- a/tests/isc/rwlock_test.c
+++ b/tests/isc/rwlock_test.c
@@ -138,8 +138,17 @@ ISC_RUN_TEST_IMPL(isc_rwlock_tryupgrade) {
        isc_result_t result;
        isc_rwlock_lock(&rwlock, isc_rwlocktype_read);
        result = isc_rwlock_tryupgrade(&rwlock);
+#if USE_PTHREAD_RWLOCK
+       /*
+        * Our pthread-based rwlock implementation does not support tryupgrade,
+        * and always returns ISC_R_LOCKBUSY.
+        */
+       assert_int_equal(result, ISC_R_LOCKBUSY);
+       isc_rwlock_unlock(&rwlock, isc_rwlocktype_read);
+#else
        assert_int_equal(result, ISC_R_SUCCESS);
        isc_rwlock_unlock(&rwlock, isc_rwlocktype_write);
+#endif /* USE_PTHREAD_RWLOCK */
 }
 
 static void *