changeset in /hg/icedtea6: 008-05-26 Lillian Angel <langel at red...

[Lillian Angel]

changeset 8d050f3a935c in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=8d050f3a935c
description:
	008-05-26  Lillian Angel  <langel at redhat.com>

	        * iMakefile.am: Updated jtreg to use correct java.
	        * Makefile.in: Regenerated.

diffstat:

3 files changed, 11 insertions(+), 6 deletions(-)
ChangeLog   |    5 +++++
Makefile.am |    6 +++---
Makefile.in |    6 +++---

diffs (68 lines):

diff -r 4ec59f62f6ca -r 8d050f3a935c ChangeLog
--- a/ChangeLog	Mon May 26 09:11:58 2008 -0400
+++ b/ChangeLog	Mon May 26 12:06:54 2008 -0400
@@ -1,3 +1,8 @@ 2008-05-26  Lillian Angel  <langel at redha
+2008-05-26  Lillian Angel  <langel at redhat.com>
+
+	* iMakefile.am: Updated jtreg to use correct java.
+	* Makefile.in: Regenerated.
+
 2008-05-26  Lillian Angel  <langel at redhat.com>
 
 	* patches/icedtea-certbundle.patch: Added trustStore and
diff -r 4ec59f62f6ca -r 8d050f3a935c Makefile.am
--- a/Makefile.am	Mon May 26 09:11:58 2008 -0400
+++ b/Makefile.am	Mon May 26 12:06:54 2008 -0400
@@ -952,21 +952,21 @@ clean-jtreg:
 
 check-hotspot: jtreg
 	mkdir -p test/hotspot/JTwork test/hotspot/JTreport
-	bootstrap/icedtea/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
+	$(ICEDTEA_BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
 		-w:test/hotspot/JTwork -r:test/hotspot/JTreport \
 		-jdk:`pwd`/openjdk/control/build/$(LINUX_DIR)/j2sdk-image \
 		`pwd`/openjdk/hotspot/test
 
 check-langtools: jtreg
 	mkdir -p test/langtools/JTwork test/langtools/JTreport
-	bootstrap/icedtea/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
+	$(ICEDTEA_BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
 		-w:test/langtools/JTwork -r:test/langtools/JTreport \
 		-jdk:`pwd`/openjdk/control/build/$(LINUX_DIR)/j2sdk-image \
 		`pwd`/openjdk/langtools/test
 
 check-jdk: jtreg
 	mkdir -p test/jdk/JTwork test/jdk/JTreport
-	bootstrap/icedtea/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
+	$(ICEDTEA_BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
 		-w:test/jdk/JTwork -r:test/jdk/JTreport \
 		-jdk:`pwd`/openjdk/control/build/$(LINUX_DIR)/j2sdk-image \
 		`pwd`/openjdk/jdk/test
diff -r 4ec59f62f6ca -r 8d050f3a935c Makefile.in
--- a/Makefile.in	Mon May 26 09:11:58 2008 -0400
+++ b/Makefile.in	Mon May 26 12:06:54 2008 -0400
@@ -1388,21 +1388,21 @@ clean-jtreg:
 
 check-hotspot: jtreg
 	mkdir -p test/hotspot/JTwork test/hotspot/JTreport
-	bootstrap/icedtea/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
+	$(ICEDTEA_BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
 		-w:test/hotspot/JTwork -r:test/hotspot/JTreport \
 		-jdk:`pwd`/openjdk/control/build/$(LINUX_DIR)/j2sdk-image \
 		`pwd`/openjdk/hotspot/test
 
 check-langtools: jtreg
 	mkdir -p test/langtools/JTwork test/langtools/JTreport
-	bootstrap/icedtea/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
+	$(ICEDTEA_BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
 		-w:test/langtools/JTwork -r:test/langtools/JTreport \
 		-jdk:`pwd`/openjdk/control/build/$(LINUX_DIR)/j2sdk-image \
 		`pwd`/openjdk/langtools/test
 
 check-jdk: jtreg
 	mkdir -p test/jdk/JTwork test/jdk/JTreport
-	bootstrap/icedtea/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
+	$(ICEDTEA_BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
 		-w:test/jdk/JTwork -r:test/jdk/JTreport \
 		-jdk:`pwd`/openjdk/control/build/$(LINUX_DIR)/j2sdk-image \
 		`pwd`/openjdk/jdk/test