Backport r800627 from the trunk.

One more place where passing in the environment may help with ICC.

git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.4.x@800628 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 5 insertions, 2 deletions

diff --git a/CHANGES b/CHANGES
index 28904ea98..7b6bf88fa 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,8 +1,8 @@
                                                      -*- coding: utf-8 -*-
 Changes for APR 1.4.0
 
-  *) Pass default environment to testflock and testoc children, so that
-     tests run when APR is compiled with Intel C Compiler.
+  *) Pass default environment to testflock, testoc and testpipe children,
+     so that tests run when APR is compiled with Intel C Compiler.
      [Bojan Smojver]
 
   *) More elaborate detection for dup3(), accept4() and epoll_create1().
diff --git a/test/testpipe.c b/test/testpipe.c
index 819c8aa27..a89d3d831 100644
--- a/test/testpipe.c
+++ b/test/testpipe.c
@@ -146,6 +146,9 @@ static void test_pipe_writefull(abts_case *tc, void *data)
                              APR_CHILD_BLOCK);
     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_procattr_error_check_set(procattr, 1);
     ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);