diff options
| author | Gustav Simonsson <[email protected]> | 2012-02-24 14:51:33 +0100 |
|---|---|---|
| committer | Gustav Simonsson <[email protected]> | 2012-02-24 14:51:33 +0100 |
| commit | dbb30ebf60fc9e851f1a8d9c0970ec2a2cc88f57 (patch) | |
| tree | 3b793798b3d6b13aab550502041cfce156755156 /Makefile.in | |
| parent | 3398aa592af611b84edad4fa56e88379df6d1735 (diff) | |
| parent | 4799b48bf81fd3c43e2a28f85cb69f8890ddfdf5 (diff) | |
| download | otp-dbb30ebf60fc9e851f1a8d9c0970ec2a2cc88f57.tar.gz otp-dbb30ebf60fc9e851f1a8d9c0970ec2a2cc88f57.tar.bz2 otp-dbb30ebf60fc9e851f1a8d9c0970ec2a2cc88f57.zip | |
Merge branch 'pan/win32_testbuild' into maint
* pan/win32_testbuild:
Set PATH correctly when building tests on win32
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index 2ded1b4356..0b1f0930ca 100644 --- a/Makefile.in +++ b/Makefile.in @@ -220,8 +220,10 @@ BOOTSTRAP_ROOT = $(ERL_TOP) LOCAL_PATH = $(ERL_TOP)/erts/bin/$(TARGET):$(ERL_TOP)/erts/bin ifeq ($(TARGET),win32) BOOT_PREFIX=$(WIN32_WRAPPER_PATH):$(BOOTSTRAP_ROOT)/bootstrap/bin: +TEST_PATH_PREFIX=$(WIN32_WRAPPER_PATH):$(ERL_TOP)/bin: else BOOT_PREFIX=$(BOOTSTRAP_ROOT)/bootstrap/bin: +TEST_PATH_PREFIX=$(ERL_TOP)/bin: endif # ---------------------------------------------------------------------- @@ -880,7 +882,7 @@ tests release_tests: $(TEST_DIRS) $(TEST_DIRS): if test -f $@/Makefile; then \ (cd $@; $(MAKE) TESTROOT=$(TESTSUITE_ROOT) \ - PATH=$(ERL_TOP)/bin:$(BOOT_PREFIX)$${PATH} release_tests) || exit $$?; \ + PATH=$(TEST_PATH_PREFIX)$(BOOT_PREFIX)$${PATH} release_tests) || exit $$?; \ fi # |