Adding possibility to disable warning if TesTcl is used with tclsh

landro · Aug 7, 2015 · 9d75668 · 9d75668
1 parent 9c1e019
commit 9d75668
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/examples.sh b/examples.sh
@@ -1,4 +1,8 @@
 #!/bin/bash
+
+# Set to false in order to provoke warning during package loading
+export DISABLE_TESTCL_INTERPRETER_WARNING=true;
+
 for f in examples/example_*.tcl
 do
     if [ 'tclsh' == "$1" ] ; then tclsh "$f";

diff --git a/irules/advanced_irule.tcl b/irules/advanced_irule.tcl
@@ -14,7 +14,7 @@ rule advanced {
       }
     } elseif { [HTTP::uri] eq "/blocked" } {
       HTTP::respond 403
-    } elseif { [HTTP::uri] starts_with "/app" } {
+    } elseif { [regexp {^/app} [HTTP::uri]] } {
       if { [active_members pool_application] == 0 } {
         if { [HTTP::header User-Agent] eq "Apache HTTP Client" } {
           HTTP::respond 503

diff --git a/pkgIndex.tcl b/pkgIndex.tcl
@@ -13,6 +13,8 @@ if  {[namespace exists ::testcl]} {
   return
 } 
 
+set disable_interpreter_warning [ expr { [ array names env DISABLE_TESTCL_INTERPRETER_WARNING ] ne "" && $env(DISABLE_TESTCL_INTERPRETER_WARNING) eq "true"} ]
+
 if { $::tcl_platform(platform) eq "java" } {
 
   if { [catch { expr {"abc" starts_with "a"} } errormsg ] } {
@@ -35,7 +37,8 @@ if { $::tcl_platform(platform) eq "java" } {
     puts stderr "WARNING"		  
   }
 
-} else {
+} elseif { ! $disable_interpreter_warning } {
+
   puts stderr "WARNING"
   puts stderr "WARNING You're using a Tcl interpreter that doesn't support the jtcl-irule extension"
   puts stderr "WARNING which requires the java based JTcl interpreter"

diff --git a/tests.sh b/tests.sh
@@ -1,4 +1,8 @@
 #!/bin/bash
+
+# Set to false in order to provoke warning during package loading
+export DISABLE_TESTCL_INTERPRETER_WARNING=true;
+
 for f in test/test_*.tcl
 do
     if [ 'tclsh' == "$1" ] ; then tclsh "$f";