From 3bd00f19bcbf192dd53248dde407d9694bdc6a3d Mon Sep 17 00:00:00 2001 From: Joshua Warner Date: Sat, 22 Feb 2014 15:35:12 -0700 Subject: [PATCH] fix remote-test functionality for windows --- makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/makefile b/makefile index 269bdc03d9..c03a64c785 100755 --- a/makefile +++ b/makefile @@ -90,6 +90,12 @@ ifneq (,$(filter mingw32 cygwin,$(build-platform))) path-separator = ; endif +target-path-separator = : + +ifeq ($(platform),windows) + target-path-separator = ; +endif + library-path-variable = LD_LIBRARY_PATH ifeq ($(build-platform),darwin) @@ -1527,7 +1533,7 @@ endif $(build)/run-tests.sh: $(test-classes) makefile $(build)/extra-dir/multi-classpath-test.txt $(build)/test/multi-classpath-test.txt echo 'cd $$(dirname $$0)' > $(@) echo "sh ./test.sh 2>/dev/null \\" >> $(@) - echo "$(shell echo $(library-path) | sed 's|$(build)|\.|g') ./$(name)-unittest${exe-suffix} ./$(notdir $(test-executable)) $(mode) \"-Djava.library.path=. -cp test$(path-separator)extra-dir\" \\" >> $(@) + echo "$(shell echo $(library-path) | sed 's|$(build)|\.|g') ./$(name)-unittest${exe-suffix} ./$(notdir $(test-executable)) $(mode) \"-Djava.library.path=. -cp test$(target-path-separator)extra-dir\" \\" >> $(@) echo "$(call class-names,$(test-build),$(filter-out $(test-support-classes), $(test-classes))) \\" >> $(@) echo "$(continuation-tests) $(tail-tests)" >> $(@)