Fossil SCM
Fix unversioned-1 test under cywing, when testing using fossil.exe.
Commit
f313c19e986b0d83e5894a48701dab92099bee82c98b6e40f926abb2fe02cff7
Parent
2060a49fe03ed9a…
1 file changed
+8
-1
+8
-1
| --- test/unversioned.test | ||
| +++ test/unversioned.test | ||
| @@ -45,14 +45,21 @@ | ||
| 45 | 45 | |
| 46 | 46 | set env(VISUAL) [appendArgs \ |
| 47 | 47 | [info nameofexecutable] " " [file join $path fake-editor.tcl]] |
| 48 | 48 | |
| 49 | 49 | ############################################################################### |
| 50 | + | |
| 51 | +# Under cygwin, the printed name with Usage: strips the extension | |
| 52 | +if { $::is_cygwin && [file extension $fossilexe] eq ".exe" } { | |
| 53 | + set fossilexeref [string range $fossilexe 0 end-4] | |
| 54 | +} else { | |
| 55 | + set fossilexeref $fossilexe | |
| 56 | +} | |
| 50 | 57 | |
| 51 | 58 | fossil unversioned |
| 52 | 59 | test unversioned-1 {[normalize_result] eq \ |
| 53 | -[string map [list %fossil% [file nativename $fossilexe]] {Usage: %fossil%\ | |
| 60 | +[string map [list %fossil% [file nativename $fossilexeref]] {Usage: %fossil%\ | |
| 54 | 61 | unversioned add|cat|edit|export|list|revert|remove|sync|touch}]} |
| 55 | 62 | |
| 56 | 63 | ############################################################################### |
| 57 | 64 | |
| 58 | 65 | fossil unversioned list |
| 59 | 66 |
| --- test/unversioned.test | |
| +++ test/unversioned.test | |
| @@ -45,14 +45,21 @@ | |
| 45 | |
| 46 | set env(VISUAL) [appendArgs \ |
| 47 | [info nameofexecutable] " " [file join $path fake-editor.tcl]] |
| 48 | |
| 49 | ############################################################################### |
| 50 | |
| 51 | fossil unversioned |
| 52 | test unversioned-1 {[normalize_result] eq \ |
| 53 | [string map [list %fossil% [file nativename $fossilexe]] {Usage: %fossil%\ |
| 54 | unversioned add|cat|edit|export|list|revert|remove|sync|touch}]} |
| 55 | |
| 56 | ############################################################################### |
| 57 | |
| 58 | fossil unversioned list |
| 59 |
| --- test/unversioned.test | |
| +++ test/unversioned.test | |
| @@ -45,14 +45,21 @@ | |
| 45 | |
| 46 | set env(VISUAL) [appendArgs \ |
| 47 | [info nameofexecutable] " " [file join $path fake-editor.tcl]] |
| 48 | |
| 49 | ############################################################################### |
| 50 | |
| 51 | # Under cygwin, the printed name with Usage: strips the extension |
| 52 | if { $::is_cygwin && [file extension $fossilexe] eq ".exe" } { |
| 53 | set fossilexeref [string range $fossilexe 0 end-4] |
| 54 | } else { |
| 55 | set fossilexeref $fossilexe |
| 56 | } |
| 57 | |
| 58 | fossil unversioned |
| 59 | test unversioned-1 {[normalize_result] eq \ |
| 60 | [string map [list %fossil% [file nativename $fossilexeref]] {Usage: %fossil%\ |
| 61 | unversioned add|cat|edit|export|list|revert|remove|sync|touch}]} |
| 62 | |
| 63 | ############################################################################### |
| 64 | |
| 65 | fossil unversioned list |
| 66 |