Fossil SCM
skip some tests when running inside of an open checkout.
Commit
36a8d91d0c79dc4c0769d9c46b1bbcba7f1bbf5f
Parent
e6309e051b623b8…
2 files changed
+7
+7
| --- test/merge_renames.test | ||
| +++ test/merge_renames.test | ||
| @@ -1,9 +1,16 @@ | ||
| 1 | 1 | # |
| 2 | 2 | # Tests for merging with renames |
| 3 | 3 | # |
| 4 | 4 | # |
| 5 | + | |
| 6 | +catch {exec $::fossilexe info} res | |
| 7 | +puts res=$res | |
| 8 | +if {![regexp {use --repository} $res]} { | |
| 9 | + puts stderr "Cannot run this test within an open checkout" | |
| 10 | + return | |
| 11 | +} | |
| 5 | 12 | |
| 6 | 13 | ###################################### |
| 7 | 14 | # Test 1 # |
| 8 | 15 | # Reported: Ticket [554f44ee74e3d] # |
| 9 | 16 | ###################################### |
| 10 | 17 |
| --- test/merge_renames.test | |
| +++ test/merge_renames.test | |
| @@ -1,9 +1,16 @@ | |
| 1 | # |
| 2 | # Tests for merging with renames |
| 3 | # |
| 4 | # |
| 5 | |
| 6 | ###################################### |
| 7 | # Test 1 # |
| 8 | # Reported: Ticket [554f44ee74e3d] # |
| 9 | ###################################### |
| 10 |
| --- test/merge_renames.test | |
| +++ test/merge_renames.test | |
| @@ -1,9 +1,16 @@ | |
| 1 | # |
| 2 | # Tests for merging with renames |
| 3 | # |
| 4 | # |
| 5 | |
| 6 | catch {exec $::fossilexe info} res |
| 7 | puts res=$res |
| 8 | if {![regexp {use --repository} $res]} { |
| 9 | puts stderr "Cannot run this test within an open checkout" |
| 10 | return |
| 11 | } |
| 12 | |
| 13 | ###################################### |
| 14 | # Test 1 # |
| 15 | # Reported: Ticket [554f44ee74e3d] # |
| 16 | ###################################### |
| 17 |
+7
| --- test/revert.test | ||
| +++ test/revert.test | ||
| @@ -36,10 +36,17 @@ | ||
| 36 | 36 | test revert-$testid$key $passed |
| 37 | 37 | } |
| 38 | 38 | |
| 39 | 39 | fossil undo |
| 40 | 40 | } |
| 41 | + | |
| 42 | +catch {exec $::fossilexe info} res | |
| 43 | +puts res=$res | |
| 44 | +if {![regexp {use --repository} $res]} { | |
| 45 | + puts stderr "Cannot run this test within an open checkout" | |
| 46 | + return | |
| 47 | +} | |
| 41 | 48 | |
| 42 | 49 | repo_init |
| 43 | 50 | |
| 44 | 51 | # Prepare first commit |
| 45 | 52 | # |
| 46 | 53 |
| --- test/revert.test | |
| +++ test/revert.test | |
| @@ -36,10 +36,17 @@ | |
| 36 | test revert-$testid$key $passed |
| 37 | } |
| 38 | |
| 39 | fossil undo |
| 40 | } |
| 41 | |
| 42 | repo_init |
| 43 | |
| 44 | # Prepare first commit |
| 45 | # |
| 46 |
| --- test/revert.test | |
| +++ test/revert.test | |
| @@ -36,10 +36,17 @@ | |
| 36 | test revert-$testid$key $passed |
| 37 | } |
| 38 | |
| 39 | fossil undo |
| 40 | } |
| 41 | |
| 42 | catch {exec $::fossilexe info} res |
| 43 | puts res=$res |
| 44 | if {![regexp {use --repository} $res]} { |
| 45 | puts stderr "Cannot run this test within an open checkout" |
| 46 | return |
| 47 | } |
| 48 | |
| 49 | repo_init |
| 50 | |
| 51 | # Prepare first commit |
| 52 | # |
| 53 |