Fossil SCM
In the th1-docs test, the dirty checkout should be done in the fossil checkout, not the current directory (which the dirty_ckout variable reflects).
Commit
62838cc7f23888bbfbe4d113a3244ef0e0dd99b26f960d1584d70d69d4299996
Parent
85b3a6002546f4f…
1 file changed
+5
-4
+5
-4
| --- test/th1-docs.test | ||
| +++ test/th1-docs.test | ||
| @@ -30,14 +30,15 @@ | ||
| 30 | 30 | if {[normalize_result] ne "1"} { |
| 31 | 31 | puts "Fossil was not compiled with Tcl support." |
| 32 | 32 | test_cleanup_then_return |
| 33 | 33 | } |
| 34 | 34 | |
| 35 | -if {$::outside_fossil_repo} { | |
| 36 | - puts "Skipping th1-docs-* tests: not in Fossil repo checkout." | |
| 37 | - test_cleanup_then_return | |
| 38 | -} elseif ($::dirty_ckout) { | |
| 35 | +run_in_checkout { | |
| 36 | + set changes [fossil changes --changed] | |
| 37 | +} | |
| 38 | + | |
| 39 | +if {[string length $changes]} { | |
| 39 | 40 | puts "Skipping th1-docs-* tests: uncommitted changes in Fossil checkout." |
| 40 | 41 | test_cleanup_then_return |
| 41 | 42 | } |
| 42 | 43 | |
| 43 | 44 | ############################################################################### |
| 44 | 45 |
| --- test/th1-docs.test | |
| +++ test/th1-docs.test | |
| @@ -30,14 +30,15 @@ | |
| 30 | if {[normalize_result] ne "1"} { |
| 31 | puts "Fossil was not compiled with Tcl support." |
| 32 | test_cleanup_then_return |
| 33 | } |
| 34 | |
| 35 | if {$::outside_fossil_repo} { |
| 36 | puts "Skipping th1-docs-* tests: not in Fossil repo checkout." |
| 37 | test_cleanup_then_return |
| 38 | } elseif ($::dirty_ckout) { |
| 39 | puts "Skipping th1-docs-* tests: uncommitted changes in Fossil checkout." |
| 40 | test_cleanup_then_return |
| 41 | } |
| 42 | |
| 43 | ############################################################################### |
| 44 |
| --- test/th1-docs.test | |
| +++ test/th1-docs.test | |
| @@ -30,14 +30,15 @@ | |
| 30 | if {[normalize_result] ne "1"} { |
| 31 | puts "Fossil was not compiled with Tcl support." |
| 32 | test_cleanup_then_return |
| 33 | } |
| 34 | |
| 35 | run_in_checkout { |
| 36 | set changes [fossil changes --changed] |
| 37 | } |
| 38 | |
| 39 | if {[string length $changes]} { |
| 40 | puts "Skipping th1-docs-* tests: uncommitted changes in Fossil checkout." |
| 41 | test_cleanup_then_return |
| 42 | } |
| 43 | |
| 44 | ############################################################################### |
| 45 |