[119168] branches/release_2_3/base/tests/test

cal at macports.org cal at macports.org
Fri Apr 18 14:25:53 PDT 2014


Revision: 119168
          https://trac.macports.org/changeset/119168
Author:   cal at macports.org
Date:     2014-04-18 14:25:53 -0700 (Fri, 18 Apr 2014)
Log Message:
-----------
revert r118610 and r118611 in preparation for a merge from trunk that will no longer require the lines that caused these changes.

Revision Links:
--------------
    https://trac.macports.org/changeset/118610
    https://trac.macports.org/changeset/118611

Modified Paths:
--------------
    branches/release_2_3/base/tests/test/dependencies-e/test.tcl
    branches/release_2_3/base/tests/test/envvariables/test.tcl
    branches/release_2_3/base/tests/test/library.tcl
    branches/release_2_3/base/tests/test/statefile-unknown-version/test.tcl
    branches/release_2_3/base/tests/test/statefile-version1/test.tcl
    branches/release_2_3/base/tests/test/statefile-version1-outdated/test.tcl
    branches/release_2_3/base/tests/test/statefile-version2/test.tcl
    branches/release_2_3/base/tests/test/statefile-version2-invalid/test.tcl
    branches/release_2_3/base/tests/test/statefile-version2-outdated/test.tcl
    branches/release_2_3/base/tests/test/trace/test.tcl
    branches/release_2_3/base/tests/test/universal/test.tcl
    branches/release_2_3/base/tests/test/variants/test.tcl
    branches/release_2_3/base/tests/test/xcodeversion/test.tcl

Modified: branches/release_2_3/base/tests/test/dependencies-e/test.tcl
===================================================================
--- branches/release_2_3/base/tests/test/dependencies-e/test.tcl	2014-04-18 20:30:53 UTC (rev 119167)
+++ branches/release_2_3/base/tests/test/dependencies-e/test.tcl	2014-04-18 21:25:53 UTC (rev 119168)
@@ -14,7 +14,7 @@
 
     set err "error: dependency 'docbook-xml-4.1.2' not found*"
     set line [get_line $output_file $err]
-    return [string tolower $line]
+    return $line
 }
 
 test dependencies-e {

Modified: branches/release_2_3/base/tests/test/envvariables/test.tcl
===================================================================
--- branches/release_2_3/base/tests/test/envvariables/test.tcl	2014-04-18 20:30:53 UTC (rev 119167)
+++ branches/release_2_3/base/tests/test/envvariables/test.tcl	2014-04-18 21:25:53 UTC (rev 119168)
@@ -32,7 +32,7 @@
     Regression test for Environment Variables.
 } -body {
     envvar_test
-} -result "AB"
+} -result "ab"
 
 
 cleanup

Modified: branches/release_2_3/base/tests/test/library.tcl
===================================================================
--- branches/release_2_3/base/tests/test/library.tcl	2014-04-18 20:30:53 UTC (rev 119167)
+++ branches/release_2_3/base/tests/test/library.tcl	2014-04-18 21:25:53 UTC (rev 119168)
@@ -145,9 +145,9 @@
     set fp [open $filename r]
 
     while {[gets $fp line] != -1} {
-        set testline [string tolower $line]
+        set line [string tolower $line]
 
-        if {[string match $lookup $testline] != 0} {
+        if {[string match $lookup $line] != 0} {
             close $fp
             return $line
         }

Modified: branches/release_2_3/base/tests/test/statefile-unknown-version/test.tcl
===================================================================
--- branches/release_2_3/base/tests/test/statefile-unknown-version/test.tcl	2014-04-18 20:30:53 UTC (rev 119167)
+++ branches/release_2_3/base/tests/test/statefile-unknown-version/test.tcl	2014-04-18 21:25:53 UTC (rev 119168)
@@ -24,7 +24,7 @@
     }
 
     set line [get_line $path/$output_file $msg]
-    return [string tolower $line]
+    return $line
 }
 
 test warning_check {

Modified: branches/release_2_3/base/tests/test/statefile-version1/test.tcl
===================================================================
--- branches/release_2_3/base/tests/test/statefile-version1/test.tcl	2014-04-18 20:30:53 UTC (rev 119167)
+++ branches/release_2_3/base/tests/test/statefile-version1/test.tcl	2014-04-18 21:25:53 UTC (rev 119168)
@@ -25,7 +25,7 @@
         set msg "*staging*destroot*"
     }
     set line [get_line $path/$output_file $msg]
-    return [string tolower $line]
+    return $line
 }
 
 test warning_check {

Modified: branches/release_2_3/base/tests/test/statefile-version1-outdated/test.tcl
===================================================================
--- branches/release_2_3/base/tests/test/statefile-version1-outdated/test.tcl	2014-04-18 20:30:53 UTC (rev 119167)
+++ branches/release_2_3/base/tests/test/statefile-version1-outdated/test.tcl	2014-04-18 21:25:53 UTC (rev 119168)
@@ -26,7 +26,7 @@
     }
 
     set line [get_line $path/$output_file $msg]
-    return [string tolower $line]
+    return $line
 }
 
 test warning_check {

Modified: branches/release_2_3/base/tests/test/statefile-version2/test.tcl
===================================================================
--- branches/release_2_3/base/tests/test/statefile-version2/test.tcl	2014-04-18 20:30:53 UTC (rev 119167)
+++ branches/release_2_3/base/tests/test/statefile-version2/test.tcl	2014-04-18 21:25:53 UTC (rev 119168)
@@ -28,7 +28,7 @@
         set msg "*staging*destroot*"
     }
     set line [get_line $path/$output_file $msg]
-    return [string tolower $line]
+    return $line
 }
 
 test statefile-v2-discard {

Modified: branches/release_2_3/base/tests/test/statefile-version2-invalid/test.tcl
===================================================================
--- branches/release_2_3/base/tests/test/statefile-version2-invalid/test.tcl	2014-04-18 20:30:53 UTC (rev 119167)
+++ branches/release_2_3/base/tests/test/statefile-version2-invalid/test.tcl	2014-04-18 21:25:53 UTC (rev 119168)
@@ -25,7 +25,7 @@
     }
 
     set line [get_line $path/$output_file $msg]
-    return [string tolower $line]
+    return $line
 }
 
 test warning_check {

Modified: branches/release_2_3/base/tests/test/statefile-version2-outdated/test.tcl
===================================================================
--- branches/release_2_3/base/tests/test/statefile-version2-outdated/test.tcl	2014-04-18 20:30:53 UTC (rev 119167)
+++ branches/release_2_3/base/tests/test/statefile-version2-outdated/test.tcl	2014-04-18 21:25:53 UTC (rev 119168)
@@ -25,7 +25,7 @@
     }
 
     set line [get_line $path/$output_file $msg]
-    return [string tolower $line]
+    return $line
 }
 
 test warning_check {

Modified: branches/release_2_3/base/tests/test/trace/test.tcl
===================================================================
--- branches/release_2_3/base/tests/test/trace/test.tcl	2014-04-18 20:30:53 UTC (rev 119167)
+++ branches/release_2_3/base/tests/test/trace/test.tcl	2014-04-18 21:25:53 UTC (rev 119168)
@@ -1,15 +1,12 @@
 package require tcltest 2
 
+# need pextlib to drop privs
+package require Pextlib 1.0
+
 namespace import tcltest::*
 
 source [file dirname $argv0]/../library.tcl
 
-# need pextlib to drop privs
-set line [get_line $autoconf "macports_tcl_dir*"]
-set macports_tcl_dir [lindex [split $line " "] 1]
-source [file join $macports_tcl_dir macports1.0 macports_fastload.tcl]
-package require Pextlib 1.0
-
 makeFile "" $output_file
 makeDirectory $work_dir
 set path [file dirname [file normalize $argv0]]

Modified: branches/release_2_3/base/tests/test/universal/test.tcl
===================================================================
--- branches/release_2_3/base/tests/test/universal/test.tcl	2014-04-18 20:30:53 UTC (rev 119167)
+++ branches/release_2_3/base/tests/test/universal/test.tcl	2014-04-18 21:25:53 UTC (rev 119168)
@@ -32,7 +32,7 @@
     exec sh -c $string > output 2>@1
     set var "variants:*"
     set line [get_line $path/$output_file $var]
-    return [string tolower $line]
+    return $line
 }
 
 

Modified: branches/release_2_3/base/tests/test/variants/test.tcl
===================================================================
--- branches/release_2_3/base/tests/test/variants/test.tcl	2014-04-18 20:30:53 UTC (rev 119167)
+++ branches/release_2_3/base/tests/test/variants/test.tcl	2014-04-18 21:25:53 UTC (rev 119168)
@@ -11,7 +11,7 @@
 
     set var "utopia variant*"
     set line [get_line $path/$output_file $var]
-    return [string tolower $line]
+    return $line
 }
 
 

Modified: branches/release_2_3/base/tests/test/xcodeversion/test.tcl
===================================================================
--- branches/release_2_3/base/tests/test/xcodeversion/test.tcl	2014-04-18 20:30:53 UTC (rev 119167)
+++ branches/release_2_3/base/tests/test/xcodeversion/test.tcl	2014-04-18 21:25:53 UTC (rev 119168)
@@ -11,7 +11,7 @@
 
     set xcode "xcodeversion*"
     set line [get_line $path/$output_file $xcode]
-    return [string tolower $line]
+    return $line
 }
 
 proc xcode_binpath {} {
@@ -19,7 +19,7 @@
 
     set xcode "xcodebuildcmd*"
     set line [get_line $path/$output_file $xcode]
-    return [string tolower $line]
+    return $line
 }
 
 test envvariables {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140418/0fc15908/attachment.html>


More information about the macports-changes mailing list