OpenJDK / jdk / hs
changeset 35831:8905c66b5fce
8149135: [jittester] Makefile copies JitTesterDriver in incorrect directory and always uses default value for number-of-tests and seed
Reviewed-by: iignatyev
| author | tpivovarova |
|---|---|
| date | Fri, 05 Feb 2016 21:16:14 +0300 |
| parents | f80ccf2a14a5 |
| children | 2207cea1d26d |
| files | hotspot/test/testlibrary/jittester/Makefile |
| diffstat | 1 files changed, 14 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/hotspot/test/testlibrary/jittester/Makefile Mon Feb 08 08:57:39 2016 +0100 +++ b/hotspot/test/testlibrary/jittester/Makefile Fri Feb 05 21:16:14 2016 +0300 @@ -35,6 +35,15 @@ TESTBASE_DIR := ws/hotspot/test endif +APPLICATION_ARGS = +ifneq "x$(TESTS_NUMBER)" "x" + APPLICATION_ARGS += --number-of-tests $(TESTS_NUMBER) +endif + +ifneq "x$(SEED)" "x" + APPLICATION_ARGS += --seed $(SEED) +endif + JAVA = $(JDK_HOME)/bin/java JAVAC = $(JDK_HOME)/bin/javac JAR = $(JDK_HOME)/bin/jar @@ -43,8 +52,9 @@ CLASSES_DIR = $(BUILD_DIR)/classes SRC_DIR = src TEST_DIR = test +DRIVER_DIR = $(TESTBASE_DIR)/jdk/test/lib/jittester/jtreg MANIFEST = manifest.mf -APPLICATION_ARGS = \ +APPLICATION_ARGS += \ --property-file $(PROPERTY_FILE) \ --testbase-dir $(TESTBASE_DIR) MAIN_CLASS = JitTestGenerator.Automatic @@ -103,8 +113,8 @@ @rm filelist @rm -rf $(CLASSES_DIR) -copytestlibrary: - @cp -r src/jdk/test/lib/jittester/jtreg $(TESTBASE_DIR)/ +copytestlibrary: $(DRIVER_DIR) + @cp -r src/jdk/test/lib/jittester/jtreg/*.java $(DRIVER_DIR) @cp -r ../jdk $(TESTBASE_DIR)/ testgroup: $(TESTBASE_DIR) @@ -117,9 +127,6 @@ testroot: $(TESTBASE_DIR) @echo 'groups=TEST.groups' > $(TESTROOT_FILE) -$(TESTBASE_DIR): +$(TESTBASE_DIR) $(DIST_DIR) $(DRIVER_DIR): $(shell if [ ! -d $@ ]; then mkdir -p $@; fi) -$(DIST_DIR): - $(shell if [ ! -d $@ ]; then mkdir -p $@; fi) -