* test/testenv.c: Return after ENOTIMPL checks trigger to prevent

spurious test failures since ABTS_NOT_IMPL doesn't longjmp away.


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@65116 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 7 insertions, 1 deletions

diff --git a/test/testenv.c b/test/testenv.c
index 6a134d353..0e341aa39 100644
--- a/test/testenv.c
+++ b/test/testenv.c
@@ -31,8 +31,9 @@ static void test_setenv(abts_case *tc, void *data)
     have_env_set = (rv != APR_ENOTIMPL);
     if (!have_env_set) {
         ABTS_NOT_IMPL(tc, "apr_env_set");
+    } else {
+        apr_assert_success(tc, "set environment variable", rv);
     }
-    apr_assert_success(tc, "set environment variable", rv);
 }
 
 static void test_getenv(abts_case *tc, void *data)
@@ -42,12 +43,14 @@ static void test_getenv(abts_case *tc, void *data)
 
     if (!have_env_set) {
         ABTS_NOT_IMPL(tc, "apr_env_set (skip test for apr_env_get)");
+        return;
     }
 
     rv = apr_env_get(&value, TEST_ENVVAR_NAME, p);
     have_env_get = (rv != APR_ENOTIMPL);
     if (!have_env_get) {
         ABTS_NOT_IMPL(tc, "apr_env_get");
+        return;
     }
     apr_assert_success(tc, "get environment variable", rv);
     ABTS_STR_EQUAL(tc, TEST_ENVVAR_VALUE, value);
@@ -60,16 +63,19 @@ static void test_delenv(abts_case *tc, void *data)
 
     if (!have_env_set) {
         ABTS_NOT_IMPL(tc, "apr_env_set (skip test for apr_env_delete)");
+        return;
     }
 
     rv = apr_env_delete(TEST_ENVVAR_NAME, p);
     if (rv == APR_ENOTIMPL) {
         ABTS_NOT_IMPL(tc, "apr_env_delete");
+        return;
     }
     apr_assert_success(tc, "delete environment variable", rv);
 
     if (!have_env_get) {
         ABTS_NOT_IMPL(tc, "apr_env_get (skip sanity check for apr_env_delete)");
+        return;
     }
     rv = apr_env_get(&value, TEST_ENVVAR_NAME, p);
     ABTS_INT_EQUAL(tc, APR_ENOENT, rv);