Author: bojan
Date: Tue Sep  1 07:12:44 2009
New Revision: 809859

URL: http://svn.apache.org/viewvc?rev=809859&view=rev
Log:
Backport r809854 from the trunk.
Pass environment to children in testsock, testshm and testproc.
Further fixes for PR 47590.

Modified:
    apr/apr/branches/1.4.x/   (props changed)
    apr/apr/branches/1.4.x/CHANGES
    apr/apr/branches/1.4.x/test/testproc.c
    apr/apr/branches/1.4.x/test/testshm.c
    apr/apr/branches/1.4.x/test/testsock.c

Propchange: apr/apr/branches/1.4.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep  1 07:12:44 2009
@@ -1 +1 @@
-/apr/apr/trunk:733052,747990,748361,748371,748565,748888,748988,749810,782838,783398,783958,784633,784773,788588,793192,794118,794485,795267,799497,800627
+/apr/apr/trunk:733052,747990,748361,748371,748565,748888,748988,749810,782838,783398,783958,784633,784773,788588,793192,794118,794485,795267,799497,800627,809854

Modified: apr/apr/branches/1.4.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/CHANGES?rev=809859&r1=809858&r2=809859&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/CHANGES [utf-8] (original)
+++ apr/apr/branches/1.4.x/CHANGES [utf-8] Tue Sep  1 07:12:44 2009
@@ -8,9 +8,9 @@
      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]
 
   *) More elaborate detection for dup3(), accept4() and epoll_create1().
      [Chetan Reddy <chetanreddy gmail.com>, Bojan Smojver]

Modified: apr/apr/branches/1.4.x/test/testproc.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/test/testproc.c?rev=809859&r1=809858&r2=809859&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/test/testproc.c (original)
+++ apr/apr/branches/1.4.x/test/testproc.c Tue Sep  1 07:12:44 2009
@@ -44,7 +44,7 @@
     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 @@
     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";

Modified: apr/apr/branches/1.4.x/test/testshm.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/test/testshm.c?rev=809859&r1=809858&r2=809859&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/test/testshm.c (original)
+++ apr/apr/branches/1.4.x/test/testshm.c Tue Sep  1 07:12:44 2009
@@ -185,6 +185,10 @@
     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 @@
     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);

Modified: apr/apr/branches/1.4.x/test/testsock.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/test/testsock.c?rev=809859&r1=809858&r2=809859&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/test/testsock.c (original)
+++ apr/apr/branches/1.4.x/test/testsock.c Tue Sep  1 07:12:44 2009
@@ -40,6 +40,9 @@
     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] = NULL;