Fossil SCM
Fix test th1-tcl-9 under cywing if testing using fossil.exe.
Commit
04ddc700f241d1f5501c6063c51b1e0fe18ed18f4e8eef06e6fb778d04bb74c8
Parent
71d8cf46b48ce8e…
1 file changed
+8
-1
+8
-1
| --- test/th1-tcl.test | ||
| +++ test/th1-tcl.test | ||
| @@ -129,11 +129,18 @@ | ||
| 129 | 129 | ############################################################################### |
| 130 | 130 | |
| 131 | 131 | fossil test-th-render --open-config \ |
| 132 | 132 | [file nativename [file join $path th1-tcl9.txt]] |
| 133 | 133 | |
| 134 | -test th1-tcl-9 {[string trim $RESULT] eq [list [file tail $fossilexe] 3 \ | |
| 134 | +# Under cygwin, the printed name with Usage: strips the extension | |
| 135 | +if { $::is_cygwin && [file extension $fossilexe] eq ".exe" } { | |
| 136 | + set fossilexeref [string range $fossilexe 0 end-4] | |
| 137 | +} else { | |
| 138 | + set fossilexeref $fossilexe | |
| 139 | +} | |
| 140 | + | |
| 141 | +test th1-tcl-9 {[string trim $RESULT] eq [list [file tail $fossilexeref] 3 \ | |
| 135 | 142 | [list test-th-render --open-config [file nativename [file join $path \ |
| 136 | 143 | th1-tcl9.txt]]]]} |
| 137 | 144 | |
| 138 | 145 | ############################################################################### |
| 139 | 146 | |
| 140 | 147 |
| --- test/th1-tcl.test | |
| +++ test/th1-tcl.test | |
| @@ -129,11 +129,18 @@ | |
| 129 | ############################################################################### |
| 130 | |
| 131 | fossil test-th-render --open-config \ |
| 132 | [file nativename [file join $path th1-tcl9.txt]] |
| 133 | |
| 134 | test th1-tcl-9 {[string trim $RESULT] eq [list [file tail $fossilexe] 3 \ |
| 135 | [list test-th-render --open-config [file nativename [file join $path \ |
| 136 | th1-tcl9.txt]]]]} |
| 137 | |
| 138 | ############################################################################### |
| 139 | |
| 140 |
| --- test/th1-tcl.test | |
| +++ test/th1-tcl.test | |
| @@ -129,11 +129,18 @@ | |
| 129 | ############################################################################### |
| 130 | |
| 131 | fossil test-th-render --open-config \ |
| 132 | [file nativename [file join $path th1-tcl9.txt]] |
| 133 | |
| 134 | # Under cygwin, the printed name with Usage: strips the extension |
| 135 | if { $::is_cygwin && [file extension $fossilexe] eq ".exe" } { |
| 136 | set fossilexeref [string range $fossilexe 0 end-4] |
| 137 | } else { |
| 138 | set fossilexeref $fossilexe |
| 139 | } |
| 140 | |
| 141 | test th1-tcl-9 {[string trim $RESULT] eq [list [file tail $fossilexeref] 3 \ |
| 142 | [list test-th-render --open-config [file nativename [file join $path \ |
| 143 | th1-tcl9.txt]]]]} |
| 144 | |
| 145 | ############################################################################### |
| 146 | |
| 147 |