Fossil SCM
make test should find test script relative to the SRCDIR so it will work when run from a separate build directory. This also allows 'make test' to run with Makefile.w32
Commit
7c0bd3ee08da67da618336a336ec5ca22ce3f7f2
Parent
dbb2cee11315443…
1 file changed
+1
-1
+1
-1
| --- src/main.mk | ||
| +++ src/main.mk | ||
| @@ -218,11 +218,11 @@ | ||
| 218 | 218 | |
| 219 | 219 | # WARNING. DANGER. Running the testsuite modifies the repository the |
| 220 | 220 | # build is done from, i.e. the checkout belongs to. Do not sync/push |
| 221 | 221 | # the repository after running the tests. |
| 222 | 222 | test: $(APPNAME) |
| 223 | - $(TCLSH) test/tester.tcl $(APPNAME) | |
| 223 | + $(TCLSH) ${SRCDIR}/../test/tester.tcl $(APPNAME) | |
| 224 | 224 | |
| 225 | 225 | VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest |
| 226 | 226 | awk '{ printf "#define MANIFEST_UUID \"%s\"\n", $$1}' $(SRCDIR)/../manifest.uuid >VERSION.h |
| 227 | 227 | awk '{ printf "#define MANIFEST_VERSION \"[%.10s]\"\n", $$1}' $(SRCDIR)/../manifest.uuid >>VERSION.h |
| 228 | 228 | awk '$$1=="D"{printf "#define MANIFEST_DATE \"%s %s\"\n", substr($$2,1,10),substr($$2,12)}' $(SRCDIR)/../manifest >>VERSION.h |
| 229 | 229 |
| --- src/main.mk | |
| +++ src/main.mk | |
| @@ -218,11 +218,11 @@ | |
| 218 | |
| 219 | # WARNING. DANGER. Running the testsuite modifies the repository the |
| 220 | # build is done from, i.e. the checkout belongs to. Do not sync/push |
| 221 | # the repository after running the tests. |
| 222 | test: $(APPNAME) |
| 223 | $(TCLSH) test/tester.tcl $(APPNAME) |
| 224 | |
| 225 | VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest |
| 226 | awk '{ printf "#define MANIFEST_UUID \"%s\"\n", $$1}' $(SRCDIR)/../manifest.uuid >VERSION.h |
| 227 | awk '{ printf "#define MANIFEST_VERSION \"[%.10s]\"\n", $$1}' $(SRCDIR)/../manifest.uuid >>VERSION.h |
| 228 | awk '$$1=="D"{printf "#define MANIFEST_DATE \"%s %s\"\n", substr($$2,1,10),substr($$2,12)}' $(SRCDIR)/../manifest >>VERSION.h |
| 229 |
| --- src/main.mk | |
| +++ src/main.mk | |
| @@ -218,11 +218,11 @@ | |
| 218 | |
| 219 | # WARNING. DANGER. Running the testsuite modifies the repository the |
| 220 | # build is done from, i.e. the checkout belongs to. Do not sync/push |
| 221 | # the repository after running the tests. |
| 222 | test: $(APPNAME) |
| 223 | $(TCLSH) ${SRCDIR}/../test/tester.tcl $(APPNAME) |
| 224 | |
| 225 | VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest |
| 226 | awk '{ printf "#define MANIFEST_UUID \"%s\"\n", $$1}' $(SRCDIR)/../manifest.uuid >VERSION.h |
| 227 | awk '{ printf "#define MANIFEST_VERSION \"[%.10s]\"\n", $$1}' $(SRCDIR)/../manifest.uuid >>VERSION.h |
| 228 | awk '$$1=="D"{printf "#define MANIFEST_DATE \"%s %s\"\n", substr($$2,1,10),substr($$2,12)}' $(SRCDIR)/../manifest >>VERSION.h |
| 229 |