Fossil SCM
Bringing back the fixes for the 'make test' from [bf480a29a6], [e46be99ff4], [129605856a], for an eventual merge to trunk.
Commit
5692702d5069a63f3dce2914d95af0f88a263d9f
Parent
e161670939b93ec…
2 files changed
+5
-1
+6
+5
-1
| --- test/merge5.test | ||
| +++ test/merge5.test | ||
| @@ -38,14 +38,18 @@ | ||
| 38 | 38 | } |
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | catch {exec $::fossilexe info} res |
| 42 | 42 | puts res=$res |
| 43 | -if {![regexp {not within an open checkout} $res]} { | |
| 43 | +if {![regexp {use --repository} $res]} { | |
| 44 | 44 | puts stderr "Cannot run this test within an open checkout" |
| 45 | 45 | return |
| 46 | 46 | } |
| 47 | +# | |
| 48 | +# Fossil will write data on $HOME, running 'fossil open' here. | |
| 49 | +# We need not to clutter the $HOME of the test caller. | |
| 50 | +set env(HOME) [pwd] | |
| 47 | 51 | |
| 48 | 52 | # Construct a test repository |
| 49 | 53 | # |
| 50 | 54 | exec sqlite3 m5.fossil <$testdir/${testfile}_repo.sql |
| 51 | 55 | fossil rebuild m5.fossil |
| 52 | 56 |
| --- test/merge5.test | |
| +++ test/merge5.test | |
| @@ -38,14 +38,18 @@ | |
| 38 | } |
| 39 | } |
| 40 | |
| 41 | catch {exec $::fossilexe info} res |
| 42 | puts res=$res |
| 43 | if {![regexp {not within an open checkout} $res]} { |
| 44 | puts stderr "Cannot run this test within an open checkout" |
| 45 | return |
| 46 | } |
| 47 | |
| 48 | # Construct a test repository |
| 49 | # |
| 50 | exec sqlite3 m5.fossil <$testdir/${testfile}_repo.sql |
| 51 | fossil rebuild m5.fossil |
| 52 |
| --- test/merge5.test | |
| +++ test/merge5.test | |
| @@ -38,14 +38,18 @@ | |
| 38 | } |
| 39 | } |
| 40 | |
| 41 | catch {exec $::fossilexe info} res |
| 42 | puts res=$res |
| 43 | if {![regexp {use --repository} $res]} { |
| 44 | puts stderr "Cannot run this test within an open checkout" |
| 45 | return |
| 46 | } |
| 47 | # |
| 48 | # Fossil will write data on $HOME, running 'fossil open' here. |
| 49 | # We need not to clutter the $HOME of the test caller. |
| 50 | set env(HOME) [pwd] |
| 51 | |
| 52 | # Construct a test repository |
| 53 | # |
| 54 | exec sqlite3 m5.fossil <$testdir/${testfile}_repo.sql |
| 55 | fossil rebuild m5.fossil |
| 56 |
| --- test/merge_renames.test | ||
| +++ test/merge_renames.test | ||
| @@ -7,10 +7,16 @@ | ||
| 7 | 7 | puts res=$res |
| 8 | 8 | if {![regexp {use --repository} $res]} { |
| 9 | 9 | puts stderr "Cannot run this test within an open checkout" |
| 10 | 10 | return |
| 11 | 11 | } |
| 12 | + | |
| 13 | + | |
| 14 | +# Fossil will write data on $HOME, running 'fossil new' here. | |
| 15 | +# We need not to clutter the $HOME of the test caller. | |
| 16 | +set env(HOME) [pwd] | |
| 17 | + | |
| 12 | 18 | |
| 13 | 19 | ###################################### |
| 14 | 20 | # Test 1 # |
| 15 | 21 | # Reported: Ticket [554f44ee74e3d] # |
| 16 | 22 | ###################################### |
| 17 | 23 |
| --- test/merge_renames.test | |
| +++ test/merge_renames.test | |
| @@ -7,10 +7,16 @@ | |
| 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 |
| --- test/merge_renames.test | |
| +++ test/merge_renames.test | |
| @@ -7,10 +7,16 @@ | |
| 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 | # Fossil will write data on $HOME, running 'fossil new' here. |
| 15 | # We need not to clutter the $HOME of the test caller. |
| 16 | set env(HOME) [pwd] |
| 17 | |
| 18 | |
| 19 | ###################################### |
| 20 | # Test 1 # |
| 21 | # Reported: Ticket [554f44ee74e3d] # |
| 22 | ###################################### |
| 23 |