Skip to content
This repository
Browse code

use ';' instead of ':' as path separator on windows when running tests

  • Loading branch information...
commit 65f6431de045d1a09db5036b1a063939e92ae8e1 1 parent 1f6051b
Joel Dice dicej authored

Showing 1 changed file with 4 additions and 4 deletions. Show diff stats Hide diff stats

  1. +4 4 makefile
8 makefile
@@ -659,8 +659,8 @@ ifeq ($(platform),darwin)
659 659 elif test -d $(sdk-dir)/$(target)5.1.sdk; then echo 5.1; \
660 660 elif test -d $(sdk-dir)/$(target)5.0.sdk; then echo 5.0; \
661 661 elif test -d $(sdk-dir)/$(target)4.3.sdk; then echo 4.3; \
662   - elif test -d $(sdk-dir)/$(target)4.2.sdk; then echo 4.2; \
663   - else echo; fi)
  662 + elif test -d $(sdk-dir)/$(target)4.2.sdk; then echo 4.2; \
  663 + else echo; fi)
664 664
665 665 ifeq ($(ios-version),)
666 666 x := $(error "couldn't find SDK")
@@ -1521,14 +1521,14 @@ endif
1521 1521 $(build)/run-tests.sh: $(test-classes) makefile $(build)/extra-dir/multi-classpath-test.txt $(build)/test/multi-classpath-test.txt
1522 1522 echo 'cd $$(dirname $$0)' > $(@)
1523 1523 echo "sh ./test.sh 2>/dev/null \\" >> $(@)
1524   - echo "$(shell echo $(library-path) | sed 's|$(build)|\.|g') ./$(name)-unittest${exe-suffix} ./$(notdir $(test-executable)) $(mode) \"-Djava.library.path=. -cp test:extra-dir\" \\" >> $(@)
  1524 + 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\" \\" >> $(@)
1525 1525 echo "$(call class-names,$(test-build),$(filter-out $(test-support-classes), $(test-classes))) \\" >> $(@)
1526 1526 echo "$(continuation-tests) $(tail-tests)" >> $(@)
1527 1527
1528 1528 $(build)/jdk-run-tests.sh: $(test-classes) makefile $(build)/extra-dir/multi-classpath-test.txt $(build)/test/multi-classpath-test.txt
1529 1529 echo 'cd $$(dirname $$0)' > $(@)
1530 1530 echo "sh ./test.sh 2>/dev/null \\" >> $(@)
1531   - echo "'' true $(JAVA_HOME)/bin/java $(mode) \"-Xmx128m -Djava.library.path=. -cp test:extra-dir:classpath\" \\" >> $(@)
  1531 + echo "'' true $(JAVA_HOME)/bin/java $(mode) \"-Xmx128m -Djava.library.path=. -cp test$(path-separator)extra-dir$(path-separator)classpath\" \\" >> $(@)
1532 1532 echo "$(call class-names,$(test-build),$(filter-out $(test-support-classes), $(test-classes))) \\" >> $(@)
1533 1533 echo "$(continuation-tests) $(tail-tests)" >> $(@)
1534 1534

0 comments on commit 65f6431

Please sign in to comment.
Something went wrong with that request. Please try again.