You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by bo...@apache.org on 2009/09/01 09:16:58 UTC
svn commit: r809860 - in /apr/apr/branches/1.3.x: ./ test/
Author: bojan
Date: Tue Sep 1 07:16:57 2009
New Revision: 809860
URL: http://svn.apache.org/viewvc?rev=809860&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.3.x/ (props changed)
apr/apr/branches/1.3.x/CHANGES
apr/apr/branches/1.3.x/test/NWGNUaprtest (props changed)
apr/apr/branches/1.3.x/test/NWGNUglobalmutexchild (props changed)
apr/apr/branches/1.3.x/test/NWGNUmod_test (props changed)
apr/apr/branches/1.3.x/test/NWGNUproc_child (props changed)
apr/apr/branches/1.3.x/test/NWGNUreadchild (props changed)
apr/apr/branches/1.3.x/test/NWGNUsockchild (props changed)
apr/apr/branches/1.3.x/test/NWGNUtestatmc (props changed)
apr/apr/branches/1.3.x/test/NWGNUtryread (props changed)
apr/apr/branches/1.3.x/test/testproc.c
apr/apr/branches/1.3.x/test/testshm.c
apr/apr/branches/1.3.x/test/testsock.c
Propchange: apr/apr/branches/1.3.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 1 07:16:57 2009
@@ -1,2 +1,2 @@
/apr/apr/branches/1.4.x:783970
-/apr/apr/trunk:712674,733052,742752,747990,748361,748371,748565,748988,749810,782838,783398,783958,788588,794485,795267,799497,800627
+/apr/apr/trunk:712674,733052,742752,747990,748361,748371,748565,748988,749810,782838,783398,783958,788588,794485,795267,799497,800627,809854
Modified: apr/apr/branches/1.3.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/CHANGES?rev=809860&r1=809859&r2=809860&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/CHANGES [utf-8] (original)
+++ apr/apr/branches/1.3.x/CHANGES [utf-8] Tue Sep 1 07:16:57 2009
@@ -1,6 +1,10 @@
-*- coding: utf-8 -*-
Changes for APR 1.3.9
+ *) Pass default environment to testsock, testshm and testproc children, so
+ that tests run when APR is compiled with Intel C Compiler.
+ [Bojan Smojver]
+
*) Fix error handling in the Solaris pollset support (Event Port backend).
PR 47645. [Jeff Trawick]
Propchange: apr/apr/branches/1.3.x/test/NWGNUaprtest
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 1 07:16:57 2009
@@ -1,3 +1,3 @@
/apr/apr/branches/1.4.x/test/nwgnuaprtest:783970
-/apr/apr/trunk/test/NWGNUaprtest:794485,795267,799497,800627
+/apr/apr/trunk/test/NWGNUaprtest:794485,795267,799497,800627,809854
/apr/apr/trunk/test/nwgnuaprtest:712674,733052,742752,747990,748361,748371,748565,748988,749810,782838,783398,783958,788588
Propchange: apr/apr/branches/1.3.x/test/NWGNUglobalmutexchild
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 1 07:16:57 2009
@@ -1,3 +1,3 @@
/apr/apr/branches/1.4.x/test/nwgnuglobalmutexchild:783970
-/apr/apr/trunk/test/NWGNUglobalmutexchild:794485,795267,799497,800627
+/apr/apr/trunk/test/NWGNUglobalmutexchild:794485,795267,799497,800627,809854
/apr/apr/trunk/test/nwgnuglobalmutexchild:712674,733052,742752,747990,748361,748371,748565,748988,749810,782838,783398,783958,788588
Propchange: apr/apr/branches/1.3.x/test/NWGNUmod_test
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 1 07:16:57 2009
@@ -1,3 +1,3 @@
/apr/apr/branches/1.4.x/test/nwgnumod_test:783970
-/apr/apr/trunk/test/NWGNUmod_test:794485,795267,799497,800627
+/apr/apr/trunk/test/NWGNUmod_test:794485,795267,799497,800627,809854
/apr/apr/trunk/test/nwgnumod_test:712674,733052,742752,747990,748361,748371,748565,748988,749810,782838,783398,783958,788588
Propchange: apr/apr/branches/1.3.x/test/NWGNUproc_child
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 1 07:16:57 2009
@@ -1,3 +1,3 @@
/apr/apr/branches/1.4.x/test/nwgnuproc_child:783970
-/apr/apr/trunk/test/NWGNUproc_child:794485,795267,799497,800627
+/apr/apr/trunk/test/NWGNUproc_child:794485,795267,799497,800627,809854
/apr/apr/trunk/test/nwgnuproc_child:712674,733052,742752,747990,748361,748371,748565,748988,749810,782838,783398,783958,788588
Propchange: apr/apr/branches/1.3.x/test/NWGNUreadchild
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 1 07:16:57 2009
@@ -1,3 +1,3 @@
/apr/apr/branches/1.4.x/test/nwgnureadchild:783970
-/apr/apr/trunk/test/NWGNUreadchild:794485,795267,799497,800627
+/apr/apr/trunk/test/NWGNUreadchild:794485,795267,799497,800627,809854
/apr/apr/trunk/test/nwgnureadchild:712674,733052,742752,747990,748361,748371,748565,748988,749810,782838,783398,783958,788588
Propchange: apr/apr/branches/1.3.x/test/NWGNUsockchild
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 1 07:16:57 2009
@@ -1,3 +1,3 @@
/apr/apr/branches/1.4.x/test/nwgnusockchild:783970
-/apr/apr/trunk/test/NWGNUsockchild:794485,795267,799497,800627
+/apr/apr/trunk/test/NWGNUsockchild:794485,795267,799497,800627,809854
/apr/apr/trunk/test/nwgnusockchild:712674,733052,742752,747990,748361,748371,748565,748988,749810,782838,783398,783958,788588
Propchange: apr/apr/branches/1.3.x/test/NWGNUtestatmc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 1 07:16:57 2009
@@ -1,3 +1,3 @@
/apr/apr/branches/1.4.x/test/nwgnutestatmc:783970
-/apr/apr/trunk/test/NWGNUtestatmc:794485,795267,799497,800627
+/apr/apr/trunk/test/NWGNUtestatmc:794485,795267,799497,800627,809854
/apr/apr/trunk/test/nwgnutestatmc:712674,733052,742752,747990,748361,748371,748565,748988,749810,782838,783398,783958,788588
Propchange: apr/apr/branches/1.3.x/test/NWGNUtryread
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 1 07:16:57 2009
@@ -1,3 +1,3 @@
/apr/apr/branches/1.4.x/test/nwgnutryread:783970
-/apr/apr/trunk/test/NWGNUtryread:794485,795267,799497,800627
+/apr/apr/trunk/test/NWGNUtryread:794485,795267,799497,800627,809854
/apr/apr/trunk/test/nwgnutryread:712674,733052,742752,747990,748361,748371,748565,748988,749810,782838,783398,783958,788588
Modified: apr/apr/branches/1.3.x/test/testproc.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/test/testproc.c?rev=809860&r1=809859&r2=809860&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/test/testproc.c (original)
+++ apr/apr/branches/1.3.x/test/testproc.c Tue Sep 1 07:16:57 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.3.x/test/testshm.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/test/testshm.c?rev=809860&r1=809859&r2=809860&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/test/testshm.c (original)
+++ apr/apr/branches/1.3.x/test/testshm.c Tue Sep 1 07:16:57 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.3.x/test/testsock.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/test/testsock.c?rev=809860&r1=809859&r2=809860&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/test/testsock.c (original)
+++ apr/apr/branches/1.3.x/test/testsock.c Tue Sep 1 07:16:57 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;