Merge pull request #173 from renfeiw/tkg

Add external group in testKitGen
eclipse-openj9 · Sep 29, 2017 · c3288bb · c3288bb
2 parents 26fe7cf + 8d7046b
commit c3288bb
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/test/Makefile b/test/Makefile
@@ -26,12 +26,14 @@
 ################################################################################
 #
 # usage: 
-#	make [JAVA_BIN=/path/to/java/bin] [SPEC=linux_x86-64] [JTREG_DIR=/path/to/jtreg/harness] [all | sanity | extended | openjdk]
+#	make [JAVA_BIN=/path/to/java/bin] [SPEC=linux_x86-64] [JTREG_DIR=/path/to/jtreg/harness] [all | sanity | extended | external | openjdk]
 #
 # sanity tests only: 
 #	make sanity [JAVA_BIN=/path/to/java/bin] [SPEC=linux_x86-64]
 # extended tests only: 
 #	make extended [JAVA_BIN=/path/to/java/bin] [SPEC=linux_x86-64]
+#external tests only:
+#	make external [JAVA_BIN=/path/to/java/bin] [SPEC=linux_x86-64]
 # openjdk jtreg tests only:
 #	make openjdk [JAVA_BIN=/path/to/java/bin] [SPEC=linux_x86-64] [JTREG_DIR=/path/to/jtreg/harness]
 #################################################################################
@@ -117,6 +119,8 @@ sanity: test_sanity
 
 extended: test_extended
 
+external: test_external
+
 openjdk : override ADD_CMD_ARGS := $(ADD_CMD_ARGS) JTREG_DIR=$(JTREG_DIR) JTREG_TEST_DIR=$(subst //,/,$(TOP_DIR)/jdk/test)
 openjdk: jtreg test_openjdk
 

diff --git a/test/README.md b/test/README.md
@@ -86,6 +86,9 @@ JAVA_VERSION=[SE80|SE90] (SE90 default value)
   * sanity tests
 
             make sanity
+  * external tests
+
+            make external
   * openjdk tests
 
             make openjdk

diff --git a/test/TestConfig/makefile b/test/TestConfig/makefile
@@ -280,8 +280,11 @@ extended: rmResultFile extended_$(JAVA_VERSION) resultsSummary
 openjdk: JVM_TEST_ROOT := $(BUILD_ROOT)
 openjdk: rmResultFile openjdk_$(JAVA_VERSION) resultsSummary
 
-runtest: rmResultFile sanity_$(JAVA_VERSION) extended_$(JAVA_VERSION) openjdk_$(JAVA_VERSION) resultsSummary
-.NOTPARALLEL: extended sanity openjdk runtest rmResultFile resultsSummary
+external: JVM_TEST_ROOT := $(BUILD_ROOT)
+external: rmResultFile external_$(JAVA_VERSION) resultsSummary
+
+runtest: rmResultFile sanity_$(JAVA_VERSION) extended_$(JAVA_VERSION) openjdk_$(JAVA_VERSION) external_$(JAVA_VERSION) resultsSummary
+.NOTPARALLEL: extended sanity openjdk external runtest rmResultFile resultsSummary
 
 # cleanup
 clean:

diff --git a/test/TestConfig/scripts/testKitGen/makeGenTool/mkgen.pl b/test/TestConfig/scripts/testKitGen/makeGenTool/mkgen.pl
@@ -27,7 +27,7 @@
 
 use constant DEBUG => 0;
 
-my @allGroups = ( "sanity", "extended", "promotion", "openjdk" );
+my @allGroups = ( "sanity", "extended", "promotion", "openjdk", "external" );
 
 my $headerComments =
 	"########################################################\n"