changeset in /hg/icedtea: Use BUILD_OUTPUT_DIR not LINUX_DIR in ...

[Mark Wielaard]

changeset ca6053992b46 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=ca6053992b46
description:
	Use BUILD_OUTPUT_DIR not LINUX_DIR in jtreg rules.

	2008-05-30  Mark Wielaard  <mark at klomp.org>

	       * Makefile.am (check-jdk): Use BUILD_OUTPUT_DIR not LINUX_DIR.
	       (check-langtools): Likewise.
	       (check-hotspot): Likewise.
	       * Makefile.in: Regenerated.

diffstat:

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

diffs (70 lines):

diff -r 1c580400c8d9 -r ca6053992b46 ChangeLog
--- a/ChangeLog	Fri May 30 01:01:19 2008 +0100
+++ b/ChangeLog	Fri May 30 15:37:38 2008 +0200
@@ -1,3 +1,10 @@ 2008-05-30  Andrew John Hughes  <gnu_and
+2008-05-30  Mark Wielaard  <mark at klomp.org>
+
+	* Makefile.am (check-jdk): Use BUILD_OUTPUT_DIR not LINUX_DIR.
+	(check-langtools): Likewise.
+	(check-hotspot): Likewise.
+	* Makefile.in: Regenerated.
+
 2008-05-30  Andrew John Hughes  <gnu_andrew at member.fsf.org>
 
 	* aclocal.m4,
diff -r 1c580400c8d9 -r ca6053992b46 Makefile.am
--- a/Makefile.am	Fri May 30 01:01:19 2008 +0100
+++ b/Makefile.am	Fri May 30 15:37:38 2008 +0200
@@ -953,21 +953,21 @@ check-hotspot: jtreg
 	mkdir -p test/hotspot/JTwork test/hotspot/JTreport
 	$(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 \
+		-jdk:`pwd`/$(BUILD_OUTPUT_DIR)/j2sdk-image \
 		`pwd`/openjdk/hotspot/test
 
 check-langtools: jtreg
 	mkdir -p test/langtools/JTwork test/langtools/JTreport
 	$(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 \
+		-jdk:`pwd`/$(BUILD_OUTPUT_DIR)/j2sdk-image \
 		`pwd`/openjdk/langtools/test
 
 check-jdk: jtreg
 	mkdir -p test/jdk/JTwork test/jdk/JTreport
 	$(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 \
+		-jdk:`pwd`/$(BUILD_OUTPUT_DIR)/j2sdk-image \
 		`pwd`/openjdk/jdk/test
 
 clean-jtreg-reports:
diff -r 1c580400c8d9 -r ca6053992b46 Makefile.in
--- a/Makefile.in	Fri May 30 01:01:19 2008 +0100
+++ b/Makefile.in	Fri May 30 15:37:38 2008 +0200
@@ -1390,21 +1390,21 @@ check-hotspot: jtreg
 	mkdir -p test/hotspot/JTwork test/hotspot/JTreport
 	$(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 \
+		-jdk:`pwd`/$(BUILD_OUTPUT_DIR)/j2sdk-image \
 		`pwd`/openjdk/hotspot/test
 
 check-langtools: jtreg
 	mkdir -p test/langtools/JTwork test/langtools/JTreport
 	$(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 \
+		-jdk:`pwd`/$(BUILD_OUTPUT_DIR)/j2sdk-image \
 		`pwd`/openjdk/langtools/test
 
 check-jdk: jtreg
 	mkdir -p test/jdk/JTwork test/jdk/JTreport
 	$(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 \
+		-jdk:`pwd`/$(BUILD_OUTPUT_DIR)/j2sdk-image \
 		`pwd`/openjdk/jdk/test
 
 clean-jtreg-reports: