OpenJDK / amber / amber
changeset 780:cbe15531645c
Merge
| author | ohair |
|---|---|
| date | Tue, 08 Jul 2008 15:46:31 -0700 |
| parents | 01733213abc6 574c011e95e3 |
| children | e1baa9c8f16f |
| files | hotspot/make/linux/Queens.class hotspot/make/linux/makefiles/buildtree.make hotspot/make/solaris/Queens.class |
| diffstat | 4 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/hotspot/make/linux/makefiles/buildtree.make Tue Jul 08 15:23:04 2008 -0700 +++ b/hotspot/make/linux/makefiles/buildtree.make Tue Jul 08 15:46:31 2008 -0700 @@ -328,7 +328,7 @@ WRONG_DATA_MODE_MSG = \ echo "JAVA_HOME must point to $(DATA_MODE)bit JDK." -test_gamma: $(BUILDTREE_MAKE) +test_gamma: $(BUILDTREE_MAKE) $(GAMMADIR)/make/test/Queens.java @echo Creating $@ ... $(QUIETLY) ( \ echo '#!/bin/sh'; \ @@ -339,7 +339,8 @@ echo "then"; \ echo " $(WRONG_DATA_MODE_MSG); exit 0;"; \ echo "fi"; \ - echo 'CLASSPATH="$(GAMMADIR)/make/$(OS_FAMILY):$$CLASSPATH"'; \ + echo "rm -f Queens.class"; \ + echo "\$${JAVA_HOME}/bin/javac -d . $(GAMMADIR)/make/test/Queens.java"; \ echo '[ -f gamma_g ] && { gamma=gamma_g; }'; \ echo './$${gamma:-gamma} $(TESTFLAGS) Queens < /dev/null'; \ ) > $@
--- a/hotspot/make/solaris/makefiles/buildtree.make Tue Jul 08 15:23:04 2008 -0700 +++ b/hotspot/make/solaris/makefiles/buildtree.make Tue Jul 08 15:46:31 2008 -0700 @@ -340,7 +340,7 @@ WRONG_DATA_MODE_MSG = \ echo "JAVA_HOME must point to $(DATA_MODE)bit JDK." -test_gamma: $(BUILDTREE_MAKE) +test_gamma: $(BUILDTREE_MAKE) $(GAMMADIR)/make/test/Queens.java @echo Creating $@ ... $(QUIETLY) ( \ echo '#!/bin/ksh'; \ @@ -351,7 +351,8 @@ echo "then"; \ echo " $(WRONG_DATA_MODE_MSG); exit 0;"; \ echo "fi"; \ - echo 'CLASSPATH="$(GAMMADIR)/make/$(OS_FAMILY):$$CLASSPATH"'; \ + echo "rm -f Queens.class"; \ + echo "\$${JAVA_HOME}/bin/javac -d . $(GAMMADIR)/make/test/Queens.java"; \ echo '[ -f gamma_g ] && { gamma=gamma_g; }'; \ echo './$${gamma:-gamma} $(TESTFLAGS) Queens < /dev/null'; \ ) > $@