apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bo...@apache.org
Subject svn commit: r799500 - in /apr/apr/branches/1.4.x: ./ CHANGES test/testflock.c test/testoc.c
Date Fri, 31 Jul 2009 03:09:54 GMT
Author: bojan
Date: Fri Jul 31 03:09:54 2009
New Revision: 799500

URL: http://svn.apache.org/viewvc?rev=799500&view=rev
Log:
Backport r799497 from the trunk.
Pass default environment to testflock and testoc (for ICC compiled stuff).

Modified:
    apr/apr/branches/1.4.x/   (props changed)
    apr/apr/branches/1.4.x/CHANGES
    apr/apr/branches/1.4.x/test/testflock.c
    apr/apr/branches/1.4.x/test/testoc.c

Propchange: apr/apr/branches/1.4.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 31 03:09:54 2009
@@ -1 +1 @@
-/apr/apr/trunk:733052,747990,748361,748371,748565,748888,748988,749810,782838,783398,783958,784633,784773,788588,793192,794118,794485,795267
+/apr/apr/trunk:733052,747990,748361,748371,748565,748888,748988,749810,782838,783398,783958,784633,784773,788588,793192,794118,794485,795267,799497

Modified: apr/apr/branches/1.4.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/CHANGES?rev=799500&r1=799499&r2=799500&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/CHANGES [utf-8] (original)
+++ apr/apr/branches/1.4.x/CHANGES [utf-8] Fri Jul 31 03:09:54 2009
@@ -1,6 +1,9 @@
                                                      -*- coding: utf-8 -*-
 Changes for APR 1.4.0
 
+  *) Pass default environment to testflock and testoc.
+     [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/testflock.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/test/testflock.c?rev=799500&r1=799499&r2=799500&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/test/testflock.c (original)
+++ apr/apr/branches/1.4.x/test/testflock.c Fri Jul 31 03:09:54 2009
@@ -39,6 +39,9 @@
             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);
 

Modified: apr/apr/branches/1.4.x/test/testoc.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/test/testoc.c?rev=799500&r1=799499&r2=799500&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/test/testoc.c (original)
+++ apr/apr/branches/1.4.x/test/testoc.c Fri Jul 31 03:09:54 2009
@@ -73,6 +73,9 @@
                              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);



Mime
View raw message