Fossil SCM
Fix the makefile so that "make test" works from a sibling build directory.
Commit
16d7e4a5c06678cc6b080df61b2bb7976bf23166
Parent
5692702d5069a63…
2 files changed
+1
-1
+1
-1
+1
-1
| --- src/main.mk | ||
| +++ src/main.mk | ||
| @@ -288,11 +288,11 @@ | ||
| 288 | 288 | |
| 289 | 289 | # WARNING. DANGER. Running the testsuite modifies the repository the |
| 290 | 290 | # build is done from, i.e. the checkout belongs to. Do not sync/push |
| 291 | 291 | # the repository after running the tests. |
| 292 | 292 | test: $(APPNAME) |
| 293 | - $(TCLSH) test/tester.tcl $(APPNAME) | |
| 293 | + $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) | |
| 294 | 294 | |
| 295 | 295 | $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion |
| 296 | 296 | $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h |
| 297 | 297 | |
| 298 | 298 | # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set |
| 299 | 299 |
| --- src/main.mk | |
| +++ src/main.mk | |
| @@ -288,11 +288,11 @@ | |
| 288 | |
| 289 | # WARNING. DANGER. Running the testsuite modifies the repository the |
| 290 | # build is done from, i.e. the checkout belongs to. Do not sync/push |
| 291 | # the repository after running the tests. |
| 292 | test: $(APPNAME) |
| 293 | $(TCLSH) test/tester.tcl $(APPNAME) |
| 294 | |
| 295 | $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion |
| 296 | $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h |
| 297 | |
| 298 | # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set |
| 299 |
| --- src/main.mk | |
| +++ src/main.mk | |
| @@ -288,11 +288,11 @@ | |
| 288 | |
| 289 | # WARNING. DANGER. Running the testsuite modifies the repository the |
| 290 | # build is done from, i.e. the checkout belongs to. Do not sync/push |
| 291 | # the repository after running the tests. |
| 292 | test: $(APPNAME) |
| 293 | $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) |
| 294 | |
| 295 | $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion |
| 296 | $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h |
| 297 | |
| 298 | # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set |
| 299 |
+1
-1
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -183,11 +183,11 @@ | ||
| 183 | 183 | |
| 184 | 184 | # WARNING. DANGER. Running the testsuite modifies the repository the |
| 185 | 185 | # build is done from, i.e. the checkout belongs to. Do not sync/push |
| 186 | 186 | # the repository after running the tests. |
| 187 | 187 | test: $(APPNAME) |
| 188 | - $(TCLSH) test/tester.tcl $(APPNAME) | |
| 188 | + $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) | |
| 189 | 189 | |
| 190 | 190 | $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion |
| 191 | 191 | $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid \ |
| 192 | 192 | $(SRCDIR)/../manifest \ |
| 193 | 193 | $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h |
| 194 | 194 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -183,11 +183,11 @@ | |
| 183 | |
| 184 | # WARNING. DANGER. Running the testsuite modifies the repository the |
| 185 | # build is done from, i.e. the checkout belongs to. Do not sync/push |
| 186 | # the repository after running the tests. |
| 187 | test: $(APPNAME) |
| 188 | $(TCLSH) test/tester.tcl $(APPNAME) |
| 189 | |
| 190 | $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion |
| 191 | $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid \ |
| 192 | $(SRCDIR)/../manifest \ |
| 193 | $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h |
| 194 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -183,11 +183,11 @@ | |
| 183 | |
| 184 | # WARNING. DANGER. Running the testsuite modifies the repository the |
| 185 | # build is done from, i.e. the checkout belongs to. Do not sync/push |
| 186 | # the repository after running the tests. |
| 187 | test: $(APPNAME) |
| 188 | $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) |
| 189 | |
| 190 | $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion |
| 191 | $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid \ |
| 192 | $(SRCDIR)/../manifest \ |
| 193 | $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h |
| 194 |