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:18:34 UTC

svn commit: r1385194 - in /tcl/rivet/trunk: ChangeLog tests/apachetest/apachetest.tcl tests/runtests.tcl tests/shorthand.rvt

Author: mxmanghi
Date: Sat Sep 15 22:18:33 2012
New Revision: 1385194

URL: http://svn.apache.org/viewvc?rev=1385194&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)
    * tests/shorthand.rvt: oddly enough the template output the same line twice. 


Modified:
    tcl/rivet/trunk/ChangeLog
    tcl/rivet/trunk/tests/apachetest/apachetest.tcl
    tcl/rivet/trunk/tests/runtests.tcl
    tcl/rivet/trunk/tests/shorthand.rvt

Modified: tcl/rivet/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/ChangeLog?rev=1385194&r1=1385193&r2=1385194&view=diff
==============================================================================
--- tcl/rivet/trunk/ChangeLog (original)
+++ tcl/rivet/trunk/ChangeLog Sat Sep 15 22:18:33 2012
@@ -1,3 +1,9 @@
+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)
+    * tests/shorthand.rvt: oddly enough the template output the same line twice. 
+
 2012-09-03 Harald Oehlmann <oe...@apache.org>
     * Thank you accepting me as committer
 

Modified: tcl/rivet/trunk/tests/apachetest/apachetest.tcl
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/tests/apachetest/apachetest.tcl?rev=1385194&r1=1385193&r2=1385194&view=diff
==============================================================================
--- tcl/rivet/trunk/tests/apachetest/apachetest.tcl (original)
+++ tcl/rivet/trunk/tests/apachetest/apachetest.tcl Sat Sep 15 22:18:33 2012
@@ -386,17 +386,24 @@ 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 {(gid=)([\d]+)(\()([^\)]+)(\))} $raw_string]  4]
 
     # replace with determinemodules
     set LOADMODULES [determinemodules $binname]
 
+    puts "reading template from $templatefile"
     set fl [open [file join . $templatefile] r]
     set template [read $fl]
     append template $extra
     close $fl
 
+    puts $template
+
     set out [subst $template]
 
     set of [open $outfile w]

Modified: tcl/rivet/trunk/tests/runtests.tcl
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/tests/runtests.tcl?rev=1385194&r1=1385193&r2=1385194&view=diff
==============================================================================
--- tcl/rivet/trunk/tests/runtests.tcl (original)
+++ tcl/rivet/trunk/tests/runtests.tcl Sat Sep 15 22:18:33 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

Modified: tcl/rivet/trunk/tests/shorthand.rvt
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/tests/shorthand.rvt?rev=1385194&r1=1385193&r2=1385194&view=diff
==============================================================================
--- tcl/rivet/trunk/tests/shorthand.rvt (original)
+++ tcl/rivet/trunk/tests/shorthand.rvt Sat Sep 15 22:18:33 2012
@@ -1,2 +1 @@
 <pre><?= "testing &lt;?= ... ?&gt; shorthand expression" ?></pre>
-<pre><?= "testing &lt;?= ... ?&gt; shorthand expression" ?></pre>



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