/hg/icedtea: Avoid recursion in calculating list of test suites ...

[andrew at icedtea.classpath.org]

changeset 2651dc3085aa in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=2651dc3085aa
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Jul 20 11:05:04 2010 +0100

	Avoid recursion in calculating list of test suites to run.

	2010-07-18 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Avoid recursion in working out which
	test suites to run. (HOTSPOT_TEST_SUITE): Set to 'hotspot'
	if the HotSpot test suite is on.
	(LANGTOOLS_TEST_SUITE): Set to 'langtools' if the langtools
	test suite is on. (JDK_TEST_SUITE): Set to 'jdk' if
	the JDK test suite is on.


diffstat:

2 files changed, 25 insertions(+), 9 deletions(-)
ChangeLog   |   12 ++++++++++++
Makefile.am |   22 +++++++++++++---------

diffs (52 lines):

diff -r e63ec10f8b3d -r 2651dc3085aa ChangeLog
--- a/ChangeLog	Sun Jul 18 18:25:01 2010 +0100
+++ b/ChangeLog	Tue Jul 20 11:05:04 2010 +0100
@@ -1,3 +1,15 @@ 2010-07-18  Andrew John Hughes  <ahughes
+2010-07-18  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	Avoid recursion in working out which
+	test suites to run.
+	(HOTSPOT_TEST_SUITE): Set to 'hotspot' if
+	the HotSpot test suite is on.
+	(LANGTOOLS_TEST_SUITE): Set to 'langtools' if
+	the langtools test suite is on.
+	(JDK_TEST_SUITE): Set to 'jdk' if
+	the JDK test suite is on.
+
 2010-07-18  Andrew John Hughes  <ahughes at redhat.com>
 
 	Allow all or individual test suites to be
diff -r e63ec10f8b3d -r 2651dc3085aa Makefile.am
--- a/Makefile.am	Sun Jul 18 18:25:01 2010 +0100
+++ b/Makefile.am	Tue Jul 20 11:05:04 2010 +0100
@@ -248,16 +248,20 @@ else
   SRC_DIR_LINK = $(REFLINK)
 endif
 
+if !DISABLE_HOTSPOT_TESTS
+HOTSPOT_TEST_SUITE = hotspot
+endif
+
+if !DISABLE_JDK_TESTS
+JDK_TEST_SUITE = $(TEST_SUITES) jdk
+endif
+
+if !DISABLE_LANGTOOLS_TESTS
+LANGTOOLS_TEST_SUITE = langtools
+endif
+
 if !DISABLE_TESTS
-if !DISABLE_HOTSPOT_TESTS
-TEST_SUITES = hotspot
-endif
-if !DISABLE_JDK_TESTS
-TEST_SUITES = $(TEST_SUITES) jdk
-endif
-if !DISABLE_LANGTOOLS_TESTS
-TEST_SUITES = $(TEST_SUITES) langtools
-endif
+TEST_SUITES = $(HOTSPOT_TEST_SUITE) $(JDK_TEST_SUITE) $(LANGTOOLS_TEST_SUITE)
 TESTS_TO_RUN = jtreg $(addprefix check-,$(TEST_SUITES))
 endif