diff options
author | Andrew McDermott <andrew.mcdermott@linaro.org> | 2013-09-02 10:09:44 +0100 |
---|---|---|
committer | Andrew McDermott <andrew.mcdermott@linaro.org> | 2013-09-02 10:14:09 +0100 |
commit | 94456ab90b4cf202e0a4474e92001c0627ff4216 (patch) | |
tree | ef06a0fa9f4cc33939d41e593b2a51d6576738d4 /openembedded | |
parent | 4dcc1956e14805dd9ef8706469595bffd98d4c9f (diff) |
jtreg: add hotspot tests
Signed-off-by: Andrew McDermott <andrew.mcdermott@linaro.org>
Diffstat (limited to 'openembedded')
-rw-r--r-- | openembedded/jtreg.yaml | 27 | ||||
-rwxr-xr-x | openembedded/scripts/jtreg-test (renamed from openembedded/scripts/jtreg-jdk-test) | 31 |
2 files changed, 34 insertions, 24 deletions
diff --git a/openembedded/jtreg.yaml b/openembedded/jtreg.yaml index 190464e..6c1840f 100644 --- a/openembedded/jtreg.yaml +++ b/openembedded/jtreg.yaml @@ -27,17 +27,24 @@ run: - 'export JT_JAVA=/usr/lib/jvm/java-8-openjdk/bin/java' - 'export PRODUCT_HOME=/usr/lib/jvm/java-8-openjdk' - 'export JDK_TEST_DIR=$TEST_DIR/openjdk8-aarch64-snapshot/jdk/test' + - 'export HOTSPOT_TEST_DIR=$TEST_DIR/openjdk8-aarch64-snapshot/hotspot/test' - 'export JDK_TEST_VMOPTS=-vmoption:-Xint' - 'export JTREG=$JT_HOME/linux/bin/jtreg-lava' - 'export JTREG_LAVA_PREBUILT_CLASSES_DIR=$CLASSES_DIR' - 'cd test-definitions/openembedded/scripts' - - './jtreg-jdk-test jdk_beans1' - - './jtreg-jdk-test jdk_io' - - './jtreg-jdk-test jdk_lang' - - './jtreg-jdk-test jdk_math' - - './jtreg-jdk-test jdk_net' - - './jtreg-jdk-test jdk_other' - - './jtreg-jdk-test jdk_security1' - - './jtreg-jdk-test jdk_text' - - './jtreg-jdk-test jdk_time' - - './jtreg-jdk-test jdk_util' + - './jtreg-test $JDK_TEST_DIR jdk_beans1' + - './jtreg-test $JDK_TEST_DIR jdk_io' + - './jtreg-test $JDK_TEST_DIR jdk_lang' + - './jtreg-test $JDK_TEST_DIR jdk_math' + - './jtreg-test $JDK_TEST_DIR jdk_net' + - './jtreg-test $JDK_TEST_DIR jdk_other' + - './jtreg-test $JDK_TEST_DIR jdk_security1' + - './jtreg-test $JDK_TEST_DIR jdk_text' + - './jtreg-test $JDK_TEST_DIR jdk_time' + - './jtreg-test $JDK_TEST_DIR jdk_util' + - './jtreg-test $HOTSPOT_TEST_DIR sanity' + - './jtreg-test $HOTSPOT_TEST_DIR compiler' + - './jtreg-test $HOTSPOT_TEST_DIR gc' + - './jtreg-test $HOTSPOT_TEST_DIR runtime' + - './jtreg-test $HOTSPOT_TEST_DIR serviceability' + - './jtreg-test $HOTSPOT_TEST_DIR testlibrary' diff --git a/openembedded/scripts/jtreg-jdk-test b/openembedded/scripts/jtreg-test index 84050be..b3b601f 100755 --- a/openembedded/scripts/jtreg-jdk-test +++ b/openembedded/scripts/jtreg-test @@ -21,8 +21,8 @@ # Author: Andrew McDermott <andrew.mcdermott@linaro.org> # -if [ $# -lt 1 ]; then - echo "usage: $0: <jdk-test>" >&2 +if [ $# -lt 2 ]; then + echo "usage: $0: <test-dir> <test>" >&2 exit 1 fi @@ -36,32 +36,35 @@ if [ -z "$JT_HOME" ]; then exit 1 fi -if [ -z "$JDK_TEST_DIR" ]; then - echo "error: JDK_TEST_DIR not set!" >&2 - exit 1 -fi - if [ -z "$JTREG" ]; then JTREG=$JT_HOME/linux/bin/jtreg-lava fi -jdk_test=$1; shift +set -x -t=/tmp/jtreg/$jdk_test.$$ +test_dir=$1 +test_to_run=$2 + +t=/tmp/jtreg/$test_to_run.$$ rm -rf $t mkdir -p $t -d=$t/testoutput/$jdk_test +d=$t/testoutput/$test_to_run pl=$d/passlist.txt fl=$d/faillist.txt +archive_bundle=$d/ARCHIVE_BUNDLE.zip -lava-test-case $jdk_test \ +lava-test-case $test_to_run \ --shell \ - make -C $JDK_TEST_DIR PRODUCT_HOME=$PRODUCT_HOME JTREG=$JTREG ALT_OUTPUTDIR=$t $jdk_test + make -C $test_dir PRODUCT_HOME=$PRODUCT_HOME JTREG=$JTREG ALT_OUTPUTDIR=$t $test_to_run exit_code=$? -[ -e $pl ] && lava-test-case-attach $jdk_test $pl -[ -e $fl ] && lava-test-case-attach $jdk_test $fl +[ -e $pl ] && lava-test-case-attach $test_to_run $pl +[ -e $fl ] && lava-test-case-attach $test_to_run $fl + +if [ $exit_code -ne 0 ]; then + [ -e $archive_bundle ] && lava-test-case-attach $test_to_run $archive_bundle +fi rm -rf $t |