Fossil SCM
Further test refinements.
Commit
596bbe342124b8275c99da4974d91b09ef9078d5
Parent
0751dbe2dac0379…
1 file changed
+9
-3
+9
-3
| --- test/symlinks.test | ||
| +++ test/symlinks.test | ||
| @@ -21,11 +21,11 @@ | ||
| 21 | 21 | if {$tcl_platform(platform) eq "windows"} { |
| 22 | 22 | puts "Symlinks are not supported on Windows." |
| 23 | 23 | test_cleanup_then_return |
| 24 | 24 | } |
| 25 | 25 | |
| 26 | -fossil test-th-eval "setting allow-symlinks" | |
| 26 | +fossil test-th-eval --open-config "setting allow-symlinks" | |
| 27 | 27 | |
| 28 | 28 | if {![string is true -strict [normalize_result]]} { |
| 29 | 29 | puts "Symlinks are not enabled." |
| 30 | 30 | test_cleanup_then_return |
| 31 | 31 | } |
| @@ -34,12 +34,17 @@ | ||
| 34 | 34 | |
| 35 | 35 | ############################################################################### |
| 36 | 36 | |
| 37 | 37 | test_setup; set rootDir [file normalize [pwd]] |
| 38 | 38 | |
| 39 | -fossil test-th-eval {repository} | |
| 39 | +fossil test-th-eval --open-config {repository} | |
| 40 | 40 | set repository [normalize_result] |
| 41 | + | |
| 42 | +if {[string length $repository] == 0} { | |
| 43 | + puts "Detection of the open repository file failed." | |
| 44 | + test_cleanup_then_return | |
| 45 | +} | |
| 41 | 46 | |
| 42 | 47 | ####################################### |
| 43 | 48 | # Use symbolic link to a directory... # |
| 44 | 49 | ####################################### |
| 45 | 50 | |
| @@ -65,11 +70,12 @@ | ||
| 65 | 70 | test symlinks-dir-5 {[normalize_result] eq "symdirA/f1.txt"} |
| 66 | 71 | |
| 67 | 72 | ############################################################################### |
| 68 | 73 | |
| 69 | 74 | fossil extras |
| 70 | -test symlinks-dir-6 {[normalize_result] eq "symdirA/f2.txt"} | |
| 75 | +test symlinks-dir-6 {[normalize_result] eq \ | |
| 76 | +"subdirA/f1.txt\nsubdirA/f2.txt\nsymdirA/f2.txt"} | |
| 71 | 77 | |
| 72 | 78 | ############################################################################### |
| 73 | 79 | |
| 74 | 80 | fossil close |
| 75 | 81 | file delete [file join $rootDir subdirA f1.txt] |
| 76 | 82 |
| --- test/symlinks.test | |
| +++ test/symlinks.test | |
| @@ -21,11 +21,11 @@ | |
| 21 | if {$tcl_platform(platform) eq "windows"} { |
| 22 | puts "Symlinks are not supported on Windows." |
| 23 | test_cleanup_then_return |
| 24 | } |
| 25 | |
| 26 | fossil test-th-eval "setting allow-symlinks" |
| 27 | |
| 28 | if {![string is true -strict [normalize_result]]} { |
| 29 | puts "Symlinks are not enabled." |
| 30 | test_cleanup_then_return |
| 31 | } |
| @@ -34,12 +34,17 @@ | |
| 34 | |
| 35 | ############################################################################### |
| 36 | |
| 37 | test_setup; set rootDir [file normalize [pwd]] |
| 38 | |
| 39 | fossil test-th-eval {repository} |
| 40 | set repository [normalize_result] |
| 41 | |
| 42 | ####################################### |
| 43 | # Use symbolic link to a directory... # |
| 44 | ####################################### |
| 45 | |
| @@ -65,11 +70,12 @@ | |
| 65 | test symlinks-dir-5 {[normalize_result] eq "symdirA/f1.txt"} |
| 66 | |
| 67 | ############################################################################### |
| 68 | |
| 69 | fossil extras |
| 70 | test symlinks-dir-6 {[normalize_result] eq "symdirA/f2.txt"} |
| 71 | |
| 72 | ############################################################################### |
| 73 | |
| 74 | fossil close |
| 75 | file delete [file join $rootDir subdirA f1.txt] |
| 76 |
| --- test/symlinks.test | |
| +++ test/symlinks.test | |
| @@ -21,11 +21,11 @@ | |
| 21 | if {$tcl_platform(platform) eq "windows"} { |
| 22 | puts "Symlinks are not supported on Windows." |
| 23 | test_cleanup_then_return |
| 24 | } |
| 25 | |
| 26 | fossil test-th-eval --open-config "setting allow-symlinks" |
| 27 | |
| 28 | if {![string is true -strict [normalize_result]]} { |
| 29 | puts "Symlinks are not enabled." |
| 30 | test_cleanup_then_return |
| 31 | } |
| @@ -34,12 +34,17 @@ | |
| 34 | |
| 35 | ############################################################################### |
| 36 | |
| 37 | test_setup; set rootDir [file normalize [pwd]] |
| 38 | |
| 39 | fossil test-th-eval --open-config {repository} |
| 40 | set repository [normalize_result] |
| 41 | |
| 42 | if {[string length $repository] == 0} { |
| 43 | puts "Detection of the open repository file failed." |
| 44 | test_cleanup_then_return |
| 45 | } |
| 46 | |
| 47 | ####################################### |
| 48 | # Use symbolic link to a directory... # |
| 49 | ####################################### |
| 50 | |
| @@ -65,11 +70,12 @@ | |
| 70 | test symlinks-dir-5 {[normalize_result] eq "symdirA/f1.txt"} |
| 71 | |
| 72 | ############################################################################### |
| 73 | |
| 74 | fossil extras |
| 75 | test symlinks-dir-6 {[normalize_result] eq \ |
| 76 | "subdirA/f1.txt\nsubdirA/f2.txt\nsymdirA/f2.txt"} |
| 77 | |
| 78 | ############################################################################### |
| 79 | |
| 80 | fossil close |
| 81 | file delete [file join $rootDir subdirA f1.txt] |
| 82 |