You are viewing a plain text version of this content. The canonical link for it is here.
Posted to rivet-dev@tcl.apache.org by mx...@apache.org on 2012/09/16 00:17:58 UTC

svn commit: r1385192 - in /tcl/rivet/branches/2.0: ChangeLog tests/apachetest/apachetest.tcl tests/runtests.tcl

Author: mxmanghi
Date: Sat Sep 15 22:17:58 2012
New Revision: 1385192

URL: http://svn.apache.org/viewvc?rev=1385192&view=rev
Log:
    * tests/runtests.tcl,tests/apachetest.tcl: User and Group directives removed from conffile
    template to make test suite independent from the output of command 'id' from which 
    the values for this parameters were inferred (Bug #53396)


Modified:
    tcl/rivet/branches/2.0/ChangeLog
    tcl/rivet/branches/2.0/tests/apachetest/apachetest.tcl
    tcl/rivet/branches/2.0/tests/runtests.tcl

Modified: tcl/rivet/branches/2.0/ChangeLog
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2.0/ChangeLog?rev=1385192&r1=1385191&r2=1385192&view=diff
==============================================================================
--- tcl/rivet/branches/2.0/ChangeLog (original)
+++ tcl/rivet/branches/2.0/ChangeLog Sat Sep 15 22:17:58 2012
@@ -1,3 +1,8 @@
+2012-09-16 Massimo Manghi <mx...@apache.org>
+    * tests/runtests.tcl,tests/apachetest.tcl: User and Group directives removed from conffile
+    template to make test suite independent from the output of command 'id' from which 
+    the values for this parameters were inferred (Bug #53396)
+
 2012-08-15 Massimo Manghi <mx...@apache.org>
     * doc/xml/dio.xml: Fixed wrong declariation of 'insert' subcommand in page manual (Bug #53670)
     * rivet/packages/dio/dio_Postgresql.tcl,rivet/packages/dio/dio_Oracle.tcl:: method 

Modified: tcl/rivet/branches/2.0/tests/apachetest/apachetest.tcl
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2.0/tests/apachetest/apachetest.tcl?rev=1385192&r1=1385191&r2=1385192&view=diff
==============================================================================
--- tcl/rivet/branches/2.0/tests/apachetest/apachetest.tcl (original)
+++ tcl/rivet/branches/2.0/tests/apachetest/apachetest.tcl Sat Sep 15 22:17:58 2012
@@ -380,8 +380,12 @@ proc apachetest::makeconf { outfile {ext
 
     #getting uid and gid of user
     catch {exec id} raw_string		
-    set username  [lindex [regexp -inline {(uid=)([\d]+)(\()([^\)]+)(\))} $raw_string]  4]
-    set group  [lindex [regexp -inline {(groups=)([\d]+)(\()([^\)]+)(\))} $raw_string]  4]
+
+# username and group no longer needed. User and Group directives removed from
+# main conffile template (#Bug 53396)
+
+#    set username  [lindex [regexp -inline {(uid=)([\d]+)(\()([^\)]+)(\))} $raw_string]  4]
+#    set group  [lindex [regexp -inline {(groups=)([\d]+)(\()([^\)]+)(\))} $raw_string]  4]
 
     # replace with determinemodules
     set LOADMODULES [determinemodules $binname]

Modified: tcl/rivet/branches/2.0/tests/runtests.tcl
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2.0/tests/runtests.tcl?rev=1385192&r1=1385191&r2=1385192&view=diff
==============================================================================
--- tcl/rivet/branches/2.0/tests/runtests.tcl (original)
+++ tcl/rivet/branches/2.0/tests/runtests.tcl Sat Sep 15 22:17:58 2012
@@ -87,8 +87,8 @@ if {$httpd_version == 1} {
 apachetest::makeconf server.conf {
     LoadModule rivet_module [file join $CWD .. src/apache-$apachetest::httpd_version .libs mod_rivet[info sharedlibextension]]
 
-    User $username
-    Group $group
+# User and Group directives removed to ease dependency of test suite from the output of command 'id' (from which
+# the values for these directives were inferred (Bug #53396)
 
     <IfModule mod_mime.c>
         TypesConfig $CWD/mime.types



---------------------------------------------------------------------
To unsubscribe, e-mail: rivet-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: rivet-cvs-help@tcl.apache.org