aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrik Nyblom <[email protected]>2012-01-31 14:59:02 +0100
committerPatrik Nyblom <[email protected]>2012-01-31 14:59:02 +0100
commit4799b48bf81fd3c43e2a28f85cb69f8890ddfdf5 (patch)
tree785625d17946ab782cc789107b4becb8b5191414
parentdacc3570332103d1f37e72463e88a2550010df77 (diff)
downloadotp-4799b48bf81fd3c43e2a28f85cb69f8890ddfdf5.tar.gz
otp-4799b48bf81fd3c43e2a28f85cb69f8890ddfdf5.tar.bz2
otp-4799b48bf81fd3c43e2a28f85cb69f8890ddfdf5.zip
Set PATH correctly when building tests on win32
-rw-r--r--Makefile.in4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in
index 648575e5fd..df59cc05e0 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
# ----------------------------------------------------------------------
@@ -868,7 +870,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
#