summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorbojan <bojan@13f79535-47bb-0310-9956-ffa450edef68>2009-07-31 03:09:54 +0000
committerbojan <bojan@13f79535-47bb-0310-9956-ffa450edef68>2009-07-31 03:09:54 +0000
commit71afd94c1b17b7f41650a45a105d65d0a3e6d52e (patch)
treefe77bd16d780928ec7d2b57088f89940e58e6768 /test
parentf6ffc90c506cea9648e73f1b014a4d69fe71e3e9 (diff)
downloadlibapr-71afd94c1b17b7f41650a45a105d65d0a3e6d52e.tar.gz
Backport r799497 from the trunk.
Pass default environment in testflock and testoc (for ICC compiled stuff). git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.4.x@799500 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'test')
-rw-r--r--test/testflock.c3
-rw-r--r--test/testoc.c3
2 files changed, 6 insertions, 0 deletions
diff --git a/test/testflock.c b/test/testflock.c
index f4350590d..136d9f649 100644
--- a/test/testflock.c
+++ b/test/testflock.c
@@ -39,6 +39,9 @@ static int launch_reader(abts_case *tc)
APR_NO_PIPE);
APR_ASSERT_SUCCESS(tc, "Couldn't set io in procattr", rv);
+ rv = apr_procattr_cmdtype_set(procattr, APR_PROGRAM_ENV);
+ APR_ASSERT_SUCCESS(tc, "Couldn't set copy environment", rv);
+
rv = apr_procattr_error_check_set(procattr, 1);
APR_ASSERT_SUCCESS(tc, "Couldn't set error check in procattr", rv);
diff --git a/test/testoc.c b/test/testoc.c
index a5342b1f2..923bd4b6d 100644
--- a/test/testoc.c
+++ b/test/testoc.c
@@ -73,6 +73,9 @@ static void test_child_kill(abts_case *tc, void *data)
APR_NO_PIPE);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
+ rv = apr_procattr_cmdtype_set(procattr, APR_PROGRAM_ENV);
+ APR_ASSERT_SUCCESS(tc, "Couldn't set copy environment", rv);
+
rv = apr_proc_create(&newproc, TESTBINPATH "occhild" EXTENSION, args, NULL, procattr, p);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
ABTS_PTR_NOTNULL(tc, newproc.in);