Fossil SCM
When testing, sort glob results for consistent test ordering across OSes.
Commit
7fc504d100eaccbd22c004759885e3fd78237c49d08efa4adce28eb4b52ceb1c
Parent
dc1836edb68ab89…
3 files changed
+1
-1
+1
-1
+5
-5
+1
-1
| --- test/delta1.test | ||
| +++ test/delta1.test | ||
| @@ -25,11 +25,11 @@ | ||
| 25 | 25 | # For each test, copy the file intact to "./t1". Make |
| 26 | 26 | # some random changes in "./t2". Then call test-delta on the |
| 27 | 27 | # two files to make sure that deltas between these two files |
| 28 | 28 | # work properly. |
| 29 | 29 | # |
| 30 | -set filelist [glob $testdir/*] | |
| 30 | +set filelist [lsort [glob $testdir/*]] | |
| 31 | 31 | foreach f $filelist { |
| 32 | 32 | if {[file isdir $f]} continue |
| 33 | 33 | set base [file root [file tail $f]] |
| 34 | 34 | set f1 [read_file $f] |
| 35 | 35 | write_file t1 $f1 |
| 36 | 36 |
| --- test/delta1.test | |
| +++ test/delta1.test | |
| @@ -25,11 +25,11 @@ | |
| 25 | # For each test, copy the file intact to "./t1". Make |
| 26 | # some random changes in "./t2". Then call test-delta on the |
| 27 | # two files to make sure that deltas between these two files |
| 28 | # work properly. |
| 29 | # |
| 30 | set filelist [glob $testdir/*] |
| 31 | foreach f $filelist { |
| 32 | if {[file isdir $f]} continue |
| 33 | set base [file root [file tail $f]] |
| 34 | set f1 [read_file $f] |
| 35 | write_file t1 $f1 |
| 36 |
| --- test/delta1.test | |
| +++ test/delta1.test | |
| @@ -25,11 +25,11 @@ | |
| 25 | # For each test, copy the file intact to "./t1". Make |
| 26 | # some random changes in "./t2". Then call test-delta on the |
| 27 | # two files to make sure that deltas between these two files |
| 28 | # work properly. |
| 29 | # |
| 30 | set filelist [lsort [glob $testdir/*]] |
| 31 | foreach f $filelist { |
| 32 | if {[file isdir $f]} continue |
| 33 | set base [file root [file tail $f]] |
| 34 | set f1 [read_file $f] |
| 35 | write_file t1 $f1 |
| 36 |
+1
-1
| --- test/merge2.test | ||
| +++ test/merge2.test | ||
| @@ -18,11 +18,11 @@ | ||
| 18 | 18 | # Tests of the delta mechanism. |
| 19 | 19 | # |
| 20 | 20 | |
| 21 | 21 | test_setup "" |
| 22 | 22 | |
| 23 | -set filelist [glob $testdir/*] | |
| 23 | +set filelist [lsort [glob $testdir/*]] | |
| 24 | 24 | foreach f $filelist { |
| 25 | 25 | if {[file isdir $f]} continue |
| 26 | 26 | set base [file root [file tail $f]] |
| 27 | 27 | if {[string match "utf16*" $base]} continue |
| 28 | 28 | set f1 [read_file $f] |
| 29 | 29 |
| --- test/merge2.test | |
| +++ test/merge2.test | |
| @@ -18,11 +18,11 @@ | |
| 18 | # Tests of the delta mechanism. |
| 19 | # |
| 20 | |
| 21 | test_setup "" |
| 22 | |
| 23 | set filelist [glob $testdir/*] |
| 24 | foreach f $filelist { |
| 25 | if {[file isdir $f]} continue |
| 26 | set base [file root [file tail $f]] |
| 27 | if {[string match "utf16*" $base]} continue |
| 28 | set f1 [read_file $f] |
| 29 |
| --- test/merge2.test | |
| +++ test/merge2.test | |
| @@ -18,11 +18,11 @@ | |
| 18 | # Tests of the delta mechanism. |
| 19 | # |
| 20 | |
| 21 | test_setup "" |
| 22 | |
| 23 | set filelist [lsort [glob $testdir/*]] |
| 24 | foreach f $filelist { |
| 25 | if {[file isdir $f]} continue |
| 26 | set base [file root [file tail $f]] |
| 27 | if {[string match "utf16*" $base]} continue |
| 28 | set f1 [read_file $f] |
| 29 |
+5
-5
| --- test/set-manifest.test | ||
| +++ test/set-manifest.test | ||
| @@ -46,21 +46,21 @@ | ||
| 46 | 46 | #### Verify classic behavior of the manifest setting |
| 47 | 47 | |
| 48 | 48 | # Setting is off by default, and there are no extra files. |
| 49 | 49 | fossil settings manifest |
| 50 | 50 | test "set-manifest-1" {[regexp {^manifest *$} $RESULT]} |
| 51 | -set filelist [glob -nocomplain manifest*] | |
| 51 | +set filelist [lsort [glob -nocomplain manifest*]] | |
| 52 | 52 | test "set-manifest-1-n" {[llength $filelist] == 0} |
| 53 | 53 | |
| 54 | 54 | # Classic behavior: TRUE value creates manifest and manifest.uuid |
| 55 | 55 | set truths [list true on 1] |
| 56 | 56 | foreach v $truths { |
| 57 | 57 | fossil settings manifest $v |
| 58 | 58 | test "set-manifest-2-$v" {$RESULT eq ""} |
| 59 | 59 | fossil settings manifest |
| 60 | 60 | test "set-manifest-2-$v-a" {[regexp "^manifest\\s+\\(local\\)\\s+$v\\s*$" $RESULT]} |
| 61 | - set filelist [glob manifest*] | |
| 61 | + set filelist [lsort [glob manifest*]] | |
| 62 | 62 | test "set-manifest-2-$v-n" {[llength $filelist] == 2} |
| 63 | 63 | foreach f $filelist { |
| 64 | 64 | test "set-manifest-2-$v-f-$f" {[file isfile $f]} |
| 65 | 65 | } |
| 66 | 66 | } |
| @@ -88,21 +88,21 @@ | ||
| 88 | 88 | foreach v $falses { |
| 89 | 89 | fossil settings manifest $v |
| 90 | 90 | test "set-manifest-3-$v" {$RESULT eq ""} |
| 91 | 91 | fossil settings manifest |
| 92 | 92 | test "set-manifest-3-$v-a" {[regexp "^manifest\\s+\\(local\\)\\s+$v\\s*$" $RESULT]} |
| 93 | - set filelist [glob -nocomplain manifest*] | |
| 93 | + set filelist [lsort [glob -nocomplain manifest*]] | |
| 94 | 94 | test "set-manifest-3-$v-n" {[llength $filelist] == 0} |
| 95 | 95 | } |
| 96 | 96 | |
| 97 | 97 | |
| 98 | 98 | # Classic behavior: unset removes manifest and manifest.uuid |
| 99 | 99 | fossil unset manifest |
| 100 | 100 | test "set-manifest-4" {$RESULT eq ""} |
| 101 | 101 | fossil settings manifest |
| 102 | 102 | test "set-manifest-4-a" {[regexp {^manifest *$} $RESULT]} |
| 103 | -set filelist [glob -nocomplain manifest*] | |
| 103 | +set filelist [lsort [glob -nocomplain manifest*]] | |
| 104 | 104 | test "set-manifest-4-n" {[llength $filelist] == 0} |
| 105 | 105 | |
| 106 | 106 | |
| 107 | 107 | ##### Tags Manifest feature extends the manifest setting |
| 108 | 108 | |
| @@ -112,11 +112,11 @@ | ||
| 112 | 112 | foreach v $truths { |
| 113 | 113 | fossil settings manifest $v |
| 114 | 114 | test "set-manifest-5-$v" {$RESULT eq ""} |
| 115 | 115 | fossil settings manifest |
| 116 | 116 | test "set-manifest-5-$v-a" {[regexp "^manifest\\s+\\(local\\)\\s+$v\\s*$" $RESULT]} |
| 117 | - set filelist [glob manifest*] | |
| 117 | + set filelist [lsort [glob manifest*]] | |
| 118 | 118 | test "set-manifest-5-$v-n" {[llength $filelist] == [string length $v]} |
| 119 | 119 | foreach f $filelist { |
| 120 | 120 | test "set-manifest-5-$v-f-$f" {[file isfile $f]} |
| 121 | 121 | } |
| 122 | 122 | } |
| 123 | 123 |
| --- test/set-manifest.test | |
| +++ test/set-manifest.test | |
| @@ -46,21 +46,21 @@ | |
| 46 | #### Verify classic behavior of the manifest setting |
| 47 | |
| 48 | # Setting is off by default, and there are no extra files. |
| 49 | fossil settings manifest |
| 50 | test "set-manifest-1" {[regexp {^manifest *$} $RESULT]} |
| 51 | set filelist [glob -nocomplain manifest*] |
| 52 | test "set-manifest-1-n" {[llength $filelist] == 0} |
| 53 | |
| 54 | # Classic behavior: TRUE value creates manifest and manifest.uuid |
| 55 | set truths [list true on 1] |
| 56 | foreach v $truths { |
| 57 | fossil settings manifest $v |
| 58 | test "set-manifest-2-$v" {$RESULT eq ""} |
| 59 | fossil settings manifest |
| 60 | test "set-manifest-2-$v-a" {[regexp "^manifest\\s+\\(local\\)\\s+$v\\s*$" $RESULT]} |
| 61 | set filelist [glob manifest*] |
| 62 | test "set-manifest-2-$v-n" {[llength $filelist] == 2} |
| 63 | foreach f $filelist { |
| 64 | test "set-manifest-2-$v-f-$f" {[file isfile $f]} |
| 65 | } |
| 66 | } |
| @@ -88,21 +88,21 @@ | |
| 88 | foreach v $falses { |
| 89 | fossil settings manifest $v |
| 90 | test "set-manifest-3-$v" {$RESULT eq ""} |
| 91 | fossil settings manifest |
| 92 | test "set-manifest-3-$v-a" {[regexp "^manifest\\s+\\(local\\)\\s+$v\\s*$" $RESULT]} |
| 93 | set filelist [glob -nocomplain manifest*] |
| 94 | test "set-manifest-3-$v-n" {[llength $filelist] == 0} |
| 95 | } |
| 96 | |
| 97 | |
| 98 | # Classic behavior: unset removes manifest and manifest.uuid |
| 99 | fossil unset manifest |
| 100 | test "set-manifest-4" {$RESULT eq ""} |
| 101 | fossil settings manifest |
| 102 | test "set-manifest-4-a" {[regexp {^manifest *$} $RESULT]} |
| 103 | set filelist [glob -nocomplain manifest*] |
| 104 | test "set-manifest-4-n" {[llength $filelist] == 0} |
| 105 | |
| 106 | |
| 107 | ##### Tags Manifest feature extends the manifest setting |
| 108 | |
| @@ -112,11 +112,11 @@ | |
| 112 | foreach v $truths { |
| 113 | fossil settings manifest $v |
| 114 | test "set-manifest-5-$v" {$RESULT eq ""} |
| 115 | fossil settings manifest |
| 116 | test "set-manifest-5-$v-a" {[regexp "^manifest\\s+\\(local\\)\\s+$v\\s*$" $RESULT]} |
| 117 | set filelist [glob manifest*] |
| 118 | test "set-manifest-5-$v-n" {[llength $filelist] == [string length $v]} |
| 119 | foreach f $filelist { |
| 120 | test "set-manifest-5-$v-f-$f" {[file isfile $f]} |
| 121 | } |
| 122 | } |
| 123 |
| --- test/set-manifest.test | |
| +++ test/set-manifest.test | |
| @@ -46,21 +46,21 @@ | |
| 46 | #### Verify classic behavior of the manifest setting |
| 47 | |
| 48 | # Setting is off by default, and there are no extra files. |
| 49 | fossil settings manifest |
| 50 | test "set-manifest-1" {[regexp {^manifest *$} $RESULT]} |
| 51 | set filelist [lsort [glob -nocomplain manifest*]] |
| 52 | test "set-manifest-1-n" {[llength $filelist] == 0} |
| 53 | |
| 54 | # Classic behavior: TRUE value creates manifest and manifest.uuid |
| 55 | set truths [list true on 1] |
| 56 | foreach v $truths { |
| 57 | fossil settings manifest $v |
| 58 | test "set-manifest-2-$v" {$RESULT eq ""} |
| 59 | fossil settings manifest |
| 60 | test "set-manifest-2-$v-a" {[regexp "^manifest\\s+\\(local\\)\\s+$v\\s*$" $RESULT]} |
| 61 | set filelist [lsort [glob manifest*]] |
| 62 | test "set-manifest-2-$v-n" {[llength $filelist] == 2} |
| 63 | foreach f $filelist { |
| 64 | test "set-manifest-2-$v-f-$f" {[file isfile $f]} |
| 65 | } |
| 66 | } |
| @@ -88,21 +88,21 @@ | |
| 88 | foreach v $falses { |
| 89 | fossil settings manifest $v |
| 90 | test "set-manifest-3-$v" {$RESULT eq ""} |
| 91 | fossil settings manifest |
| 92 | test "set-manifest-3-$v-a" {[regexp "^manifest\\s+\\(local\\)\\s+$v\\s*$" $RESULT]} |
| 93 | set filelist [lsort [glob -nocomplain manifest*]] |
| 94 | test "set-manifest-3-$v-n" {[llength $filelist] == 0} |
| 95 | } |
| 96 | |
| 97 | |
| 98 | # Classic behavior: unset removes manifest and manifest.uuid |
| 99 | fossil unset manifest |
| 100 | test "set-manifest-4" {$RESULT eq ""} |
| 101 | fossil settings manifest |
| 102 | test "set-manifest-4-a" {[regexp {^manifest *$} $RESULT]} |
| 103 | set filelist [lsort [glob -nocomplain manifest*]] |
| 104 | test "set-manifest-4-n" {[llength $filelist] == 0} |
| 105 | |
| 106 | |
| 107 | ##### Tags Manifest feature extends the manifest setting |
| 108 | |
| @@ -112,11 +112,11 @@ | |
| 112 | foreach v $truths { |
| 113 | fossil settings manifest $v |
| 114 | test "set-manifest-5-$v" {$RESULT eq ""} |
| 115 | fossil settings manifest |
| 116 | test "set-manifest-5-$v-a" {[regexp "^manifest\\s+\\(local\\)\\s+$v\\s*$" $RESULT]} |
| 117 | set filelist [lsort [glob manifest*]] |
| 118 | test "set-manifest-5-$v-n" {[llength $filelist] == [string length $v]} |
| 119 | foreach f $filelist { |
| 120 | test "set-manifest-5-$v-f-$f" {[file isfile $f]} |
| 121 | } |
| 122 | } |
| 123 |