diff options
| -rw-r--r-- | CHANGES | 6 | ||||
| -rw-r--r-- | test/testproc.c | 4 | ||||
| -rw-r--r-- | test/testshm.c | 8 | ||||
| -rw-r--r-- | test/testsock.c | 3 |
4 files changed, 16 insertions, 5 deletions
@@ -5,9 +5,9 @@ Changes for APR 2.0.0 Fix overflow in pools and rmm, where size alignment was taking place. [Matt Lewis <mattlewis@google.com>, Sander Striker] - *) Pass default environment to testflock, testoc and testpipe children, - so that tests run when APR is compiled with Intel C Compiler. - [Bojan Smojver] + *) Pass default environment to testflock, testoc, testpipe, testsock, + testshm and testproc children, so that tests run when APR is compiled + with Intel C Compiler. [Bojan Smojver] *) Make sure that "make check" is used in the RPM spec file, so that the crypto, dbd and dbm tests pass. [Graham Leggett] diff --git a/test/testproc.c b/test/testproc.c index 4791b9281..5cf768f1e 100644 --- a/test/testproc.c +++ b/test/testproc.c @@ -44,7 +44,7 @@ static void test_create_proc(abts_case *tc, void *data) rv = apr_procattr_dir_set(attr, "data"); ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); - rv = apr_procattr_cmdtype_set(attr, APR_PROGRAM); + rv = apr_procattr_cmdtype_set(attr, APR_PROGRAM_ENV); ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); args[0] = "proc_child" EXTENSION; @@ -120,7 +120,7 @@ static void test_file_redir(abts_case *tc, void *data) ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); rv = apr_procattr_dir_set(attr, "data"); ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); - rv = apr_procattr_cmdtype_set(attr, APR_PROGRAM); + rv = apr_procattr_cmdtype_set(attr, APR_PROGRAM_ENV); ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); args[0] = "proc_child"; diff --git a/test/testshm.c b/test/testshm.c index ab9b76c21..6c192f290 100644 --- a/test/testshm.c +++ b/test/testshm.c @@ -185,6 +185,10 @@ static void test_named(abts_case *tc, void *data) rv = apr_procattr_create(&attr1, p); ABTS_PTR_NOTNULL(tc, attr1); APR_ASSERT_SUCCESS(tc, "Couldn't create attr1", rv); + + rv = apr_procattr_cmdtype_set(attr1, APR_PROGRAM_ENV); + APR_ASSERT_SUCCESS(tc, "Couldn't set copy environment", rv); + args[0] = apr_pstrdup(p, "testshmproducer" EXTENSION); args[1] = NULL; rv = apr_proc_create(&pidproducer, TESTBINPATH "testshmproducer" EXTENSION, args, @@ -194,6 +198,10 @@ static void test_named(abts_case *tc, void *data) rv = apr_procattr_create(&attr2, p); ABTS_PTR_NOTNULL(tc, attr2); APR_ASSERT_SUCCESS(tc, "Couldn't create attr2", rv); + + rv = apr_procattr_cmdtype_set(attr2, APR_PROGRAM_ENV); + APR_ASSERT_SUCCESS(tc, "Couldn't set copy environment", rv); + args[0] = apr_pstrdup(p, "testshmconsumer" EXTENSION); rv = apr_proc_create(&pidconsumer, TESTBINPATH "testshmconsumer" EXTENSION, args, NULL, attr2, p); diff --git a/test/testsock.c b/test/testsock.c index 1b19141ad..a2d531923 100644 --- a/test/testsock.c +++ b/test/testsock.c @@ -45,6 +45,9 @@ static void launch_child(abts_case *tc, apr_proc_t *proc, const char *arg1, apr_ rv = apr_procattr_error_check_set(procattr, 1); APR_ASSERT_SUCCESS(tc, "Couldn't set error check in procattr", rv); + rv = apr_procattr_cmdtype_set(procattr, APR_PROGRAM_ENV); + APR_ASSERT_SUCCESS(tc, "Couldn't set copy environment", rv); + args[0] = "sockchild" EXTENSION; args[1] = arg1; args[2] = socket_name; |