Fossil SCM
When testing, remove _fossil in temporary home for cygwin.
Commit
71d8cf46b48ce8e46a11fc6416d96f4253b11b8c3af5d8eba9738ef2a82e9c25
Parent
7a666efb6ae1757…
1 file changed
+2
-1
+2
-1
| --- test/tester.tcl | ||
| +++ test/tester.tcl | ||
| @@ -30,10 +30,11 @@ | ||
| 30 | 30 | set testfiledir [file normalize [file dirname [info script]]] |
| 31 | 31 | set testrundir [pwd] |
| 32 | 32 | set testdir [file normalize [file dirname $argv0]] |
| 33 | 33 | set fossilexe [file normalize [lindex $argv 0]] |
| 34 | 34 | set is_windows [expr {$::tcl_platform(platform) eq "windows"}] |
| 35 | +set is_cygwin [regexp {^CYGWIN} $::tcl_platform(os)] | |
| 35 | 36 | |
| 36 | 37 | if {$::is_windows} { |
| 37 | 38 | if {[string length [file extension $fossilexe]] == 0} { |
| 38 | 39 | append fossilexe .exe |
| 39 | 40 | } |
| @@ -512,11 +513,11 @@ | ||
| 512 | 513 | if {![info exists ::tempKeepHome]} {delete_temporary_home} |
| 513 | 514 | } |
| 514 | 515 | |
| 515 | 516 | proc delete_temporary_home {} { |
| 516 | 517 | if {$::KEEP} {return}; # All cleanup disabled? |
| 517 | - if {$::is_windows} { | |
| 518 | + if {$::is_windows || $::is_cygwin} { | |
| 518 | 519 | robust_delete [file join $::tempHomePath _fossil] |
| 519 | 520 | } else { |
| 520 | 521 | robust_delete [file join $::tempHomePath .fossil] |
| 521 | 522 | } |
| 522 | 523 | robust_delete $::tempHomePath |
| 523 | 524 |
| --- test/tester.tcl | |
| +++ test/tester.tcl | |
| @@ -30,10 +30,11 @@ | |
| 30 | set testfiledir [file normalize [file dirname [info script]]] |
| 31 | set testrundir [pwd] |
| 32 | set testdir [file normalize [file dirname $argv0]] |
| 33 | set fossilexe [file normalize [lindex $argv 0]] |
| 34 | set is_windows [expr {$::tcl_platform(platform) eq "windows"}] |
| 35 | |
| 36 | if {$::is_windows} { |
| 37 | if {[string length [file extension $fossilexe]] == 0} { |
| 38 | append fossilexe .exe |
| 39 | } |
| @@ -512,11 +513,11 @@ | |
| 512 | if {![info exists ::tempKeepHome]} {delete_temporary_home} |
| 513 | } |
| 514 | |
| 515 | proc delete_temporary_home {} { |
| 516 | if {$::KEEP} {return}; # All cleanup disabled? |
| 517 | if {$::is_windows} { |
| 518 | robust_delete [file join $::tempHomePath _fossil] |
| 519 | } else { |
| 520 | robust_delete [file join $::tempHomePath .fossil] |
| 521 | } |
| 522 | robust_delete $::tempHomePath |
| 523 |
| --- test/tester.tcl | |
| +++ test/tester.tcl | |
| @@ -30,10 +30,11 @@ | |
| 30 | set testfiledir [file normalize [file dirname [info script]]] |
| 31 | set testrundir [pwd] |
| 32 | set testdir [file normalize [file dirname $argv0]] |
| 33 | set fossilexe [file normalize [lindex $argv 0]] |
| 34 | set is_windows [expr {$::tcl_platform(platform) eq "windows"}] |
| 35 | set is_cygwin [regexp {^CYGWIN} $::tcl_platform(os)] |
| 36 | |
| 37 | if {$::is_windows} { |
| 38 | if {[string length [file extension $fossilexe]] == 0} { |
| 39 | append fossilexe .exe |
| 40 | } |
| @@ -512,11 +513,11 @@ | |
| 513 | if {![info exists ::tempKeepHome]} {delete_temporary_home} |
| 514 | } |
| 515 | |
| 516 | proc delete_temporary_home {} { |
| 517 | if {$::KEEP} {return}; # All cleanup disabled? |
| 518 | if {$::is_windows || $::is_cygwin} { |
| 519 | robust_delete [file join $::tempHomePath _fossil] |
| 520 | } else { |
| 521 | robust_delete [file join $::tempHomePath .fossil] |
| 522 | } |
| 523 | robust_delete $::tempHomePath |
| 524 |