Merge pull request #858 from klickverbot/test-out-of-source

test/*/Makefile: Do not assume that $(ROOT) is a relative path.
dlang · Jul 2, 2014 · 2ab86f5 · 2ab86f5
2 parents c661eea + d07d493
commit 2ab86f5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/test/exceptions/Makefile b/test/exceptions/Makefile
@@ -7,7 +7,7 @@ DRUNTIMESO:=
 QUIET:=
 
 SRC:=src
-ROOT:=obj/$(OS)/$(MODEL)
+ROOT:=./obj/$(OS)/$(MODEL)
 TESTS:=stderr_msg unittest_assert
 
 ifneq (default,$(MODEL))
@@ -21,7 +21,7 @@ all: $(addprefix $(ROOT)/,$(addsuffix .done,$(TESTS)))
 
 $(ROOT)/%.done: $(ROOT)/%
 	@echo Testing $*
-	$(QUIET)./$(ROOT)/$* $(RUN_ARGS)
+	$(QUIET)$(ROOT)/$* $(RUN_ARGS)
 	@touch $@
 
 $(ROOT)/stderr_msg.done: $(ROOT)/stderr_msg

diff --git a/test/init_fini/Makefile b/test/init_fini/Makefile
@@ -7,7 +7,7 @@ DRUNTIMESO:=
 QUIET:=
 
 SRC:=src
-ROOT:=obj/$(OS)/$(MODEL)
+ROOT:=./obj/$(OS)/$(MODEL)
 TESTS:=thread_join runtime_args
 
 ifneq (default,$(MODEL))
@@ -21,7 +21,7 @@ all: $(addprefix $(ROOT)/,$(addsuffix .done,$(TESTS)))
 
 $(ROOT)/%.done: $(ROOT)/%
 	@echo Testing $*
-	$(QUIET)./$(ROOT)/$* $(RUN_ARGS)
+	$(QUIET)$(ROOT)/$* $(RUN_ARGS)
 	@touch $@
 
 $(ROOT)/%: $(SRC)/%.d

diff --git a/test/shared/Makefile b/test/shared/Makefile
@@ -7,7 +7,7 @@ DRUNTIMESO:=
 QUIET:=
 
 SRC:=src
-ROOT:=obj/$(OS)/$(MODEL)
+ROOT:=./obj/$(OS)/$(MODEL)
 TESTS:=link load linkD linkDR loadDR host finalize
 TESTS+=link_linkdep load_linkdep link_loaddep load_loaddep
 
@@ -24,7 +24,7 @@ $(ROOT)/loadDR.done: RUN_ARGS:=$(DRUNTIMESO)
 
 $(ROOT)/%.done: $(ROOT)/%
 	@echo Testing $*
-	$(QUIET)./$(ROOT)/$* $(RUN_ARGS)
+	$(QUIET)$(ROOT)/$* $(RUN_ARGS)
 	@touch $@
 
 $(ROOT)/link: $(SRC)/link.d $(ROOT)/lib.so $(DRUNTIMESO)