Fossil SCM
In the 'merge5' test, use the configured Fossil executable instead of relying on the PATH.
Commit
acbee54e8ba8a3bd9a8f18baabd8bde4814fc0ac
Parent
0a2eaa5ac2a71a3…
1 file changed
+1
-1
+1
-1
| --- test/merge5.test | ||
| +++ test/merge5.test | ||
| @@ -48,11 +48,11 @@ | ||
| 48 | 48 | # We need not to clutter the $HOME of the test caller. |
| 49 | 49 | set env(HOME) [pwd] |
| 50 | 50 | |
| 51 | 51 | # Construct a test repository |
| 52 | 52 | # |
| 53 | -exec fossil sqlite3 --no-repository m5.fossil <$testdir/${testfile}_repo.sql | |
| 53 | +exec $::fossilexe sqlite3 --no-repository m5.fossil <$testdir/${testfile}_repo.sql | |
| 54 | 54 | fossil rebuild m5.fossil |
| 55 | 55 | fossil open m5.fossil |
| 56 | 56 | fossil user default drh --user drh |
| 57 | 57 | fossil update baseline |
| 58 | 58 | checkout-test 10 { |
| 59 | 59 |
| --- test/merge5.test | |
| +++ test/merge5.test | |
| @@ -48,11 +48,11 @@ | |
| 48 | # We need not to clutter the $HOME of the test caller. |
| 49 | set env(HOME) [pwd] |
| 50 | |
| 51 | # Construct a test repository |
| 52 | # |
| 53 | exec fossil sqlite3 --no-repository m5.fossil <$testdir/${testfile}_repo.sql |
| 54 | fossil rebuild m5.fossil |
| 55 | fossil open m5.fossil |
| 56 | fossil user default drh --user drh |
| 57 | fossil update baseline |
| 58 | checkout-test 10 { |
| 59 |
| --- test/merge5.test | |
| +++ test/merge5.test | |
| @@ -48,11 +48,11 @@ | |
| 48 | # We need not to clutter the $HOME of the test caller. |
| 49 | set env(HOME) [pwd] |
| 50 | |
| 51 | # Construct a test repository |
| 52 | # |
| 53 | exec $::fossilexe sqlite3 --no-repository m5.fossil <$testdir/${testfile}_repo.sql |
| 54 | fossil rebuild m5.fossil |
| 55 | fossil open m5.fossil |
| 56 | fossil user default drh --user drh |
| 57 | fossil update baseline |
| 58 | checkout-test 10 { |
| 59 |