From 751be8e82a104ad60e7fa67227cff2bc6e10a01a Mon Sep 17 00:00:00 2001 From: Andrew McDermott Date: Thu, 14 Nov 2013 15:11:19 +0000 Subject: Rework OpenJDK tests to invoke jtreg directly This commit reworks the invocation of the JTREG tests to rely on jtreg(1) directly. It was previously using the makefiles in the OpenJDK test directories but there were significant differences between the JDK Makefile and the hotspot Makefile which added unnecessary complexity, particularly as we now want to run tests against both -client and -server VMs. There are also additional parameters for specifying the test timeout and job concurrency. And I also moved the exclude file into this repo so that it can be subject to code reviews. Change-Id: Ic90df7969f862c3fc5ecb71f658601cd2e1d89ba Signed-off-by: Andrew McDermott --- openembedded/jtreg-jdk_other.yaml | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) (limited to 'openembedded/jtreg-jdk_other.yaml') diff --git a/openembedded/jtreg-jdk_other.yaml b/openembedded/jtreg-jdk_other.yaml index d322cb1..bb830c4 100644 --- a/openembedded/jtreg-jdk_other.yaml +++ b/openembedded/jtreg-jdk_other.yaml @@ -25,8 +25,24 @@ metadata: - test devices: - rtsm_ve-armv8 +params: + - 'JAVA_VM=-client' + - 'JTREG_VERBOSE=-v1' + - 'JTREG_CONC=-conc:1' + - 'JTREG_TIMEOUT=-timeout:3' + - 'JTREG_EXCLUDE_FILE=../jtreg/exclude.txt' + - 'PRODUCT_HOME=/usr/lib/jvm/java-8-openjdk' +install: + git-repos: + - git://git.linaro.org/leg/openjdk/jtreg-bin.git + - git://git.linaro.org/qa/test-definitions.git run: steps: - - 'source $HOME/jtreg-setup.env' - - 'cd $JTREG_TESTRUN_ID/test-definitions/openembedded/scripts' - - './jtreg-test $JDK_TEST_DIR jdk_other' + - 'PATH=/lava/tests/$TESTRUN_ID/jtreg-bin/jtreg/linux/bin:$PATH' + - 'cd /lava/tests/$TESTRUN_ID/test-definitions/openembedded/scripts' + - './jtreg-test -t jdk_other -j $JAVA_VM -p $PRODUCT_HOME -- $JTREG_CONC $JTREG_TEST_MODE $JTREG_TIMEOUT -exclude:$JTREG_EXCLUDE_FILE $JTREG_VERBOSE $PRODUCT_HOME/jtreg/jdk/test/java/other' +parse: + pattern: "(?P^(Passed|FAILED)):\\s+(?P(.*))" + fixupdict: + Passed: pass + FAILED: fail -- cgit v1.2.3