Fossil SCM
Skip entire merge5.test until fossil sqlite3 --no-repository works right.
Commit
6167f69a218804bd8f45d76cb60c48e14adfb81743efca72997b2f5f508e9d3c
Parent
876b436cf5ba185…
1 file changed
+8
+8
| --- test/merge5.test | ||
| +++ test/merge5.test | ||
| @@ -15,10 +15,18 @@ | ||
| 15 | 15 | # |
| 16 | 16 | ############################################################################ |
| 17 | 17 | # |
| 18 | 18 | # Tests of the "merge" command |
| 19 | 19 | # |
| 20 | + | |
| 21 | +puts "Skipping Merge5 tests" | |
| 22 | +protOut { | |
| 23 | +fossil sqlite3 --no-repository reacts badly to SQL dumped from | |
| 24 | +repositories created from fossil older than version 2.0. | |
| 25 | +} | |
| 26 | +test merge5-sqlite3-issue false knownBug | |
| 27 | +test_cleanup_then_return | |
| 20 | 28 | |
| 21 | 29 | # Verify the results of a check-out |
| 22 | 30 | # |
| 23 | 31 | proc checkout-test {testid expected_content} { |
| 24 | 32 | set flist {} |
| 25 | 33 |
| --- test/merge5.test | |
| +++ test/merge5.test | |
| @@ -15,10 +15,18 @@ | |
| 15 | # |
| 16 | ############################################################################ |
| 17 | # |
| 18 | # Tests of the "merge" command |
| 19 | # |
| 20 | |
| 21 | # Verify the results of a check-out |
| 22 | # |
| 23 | proc checkout-test {testid expected_content} { |
| 24 | set flist {} |
| 25 |
| --- test/merge5.test | |
| +++ test/merge5.test | |
| @@ -15,10 +15,18 @@ | |
| 15 | # |
| 16 | ############################################################################ |
| 17 | # |
| 18 | # Tests of the "merge" command |
| 19 | # |
| 20 | |
| 21 | puts "Skipping Merge5 tests" |
| 22 | protOut { |
| 23 | fossil sqlite3 --no-repository reacts badly to SQL dumped from |
| 24 | repositories created from fossil older than version 2.0. |
| 25 | } |
| 26 | test merge5-sqlite3-issue false knownBug |
| 27 | test_cleanup_then_return |
| 28 | |
| 29 | # Verify the results of a check-out |
| 30 | # |
| 31 | proc checkout-test {testid expected_content} { |
| 32 | set flist {} |
| 33 |