diff options
| -rw-r--r-- | openembedded/jtreg-hotspot-compiler.yaml | 7 | ||||
| -rw-r--r-- | openembedded/jtreg-hotspot-gc.yaml | 7 | ||||
| -rw-r--r-- | openembedded/jtreg-hotspot-runtime.yaml | 7 | ||||
| -rw-r--r-- | openembedded/jtreg-hotspot-sanity.yaml | 7 | ||||
| -rw-r--r-- | openembedded/jtreg-hotspot-serviceability.yaml | 7 | ||||
| -rw-r--r-- | openembedded/jtreg-hotspot-testlibrary.yaml | 7 | ||||
| -rw-r--r-- | openembedded/jtreg-jdk_beans.yaml | 7 | ||||
| -rw-r--r-- | openembedded/jtreg-jdk_io.yaml | 7 | ||||
| -rw-r--r-- | openembedded/jtreg-jdk_lang.yaml | 7 | ||||
| -rw-r--r-- | openembedded/jtreg-jdk_math.yaml | 7 | ||||
| -rw-r--r-- | openembedded/jtreg-jdk_net.yaml | 7 | ||||
| -rw-r--r-- | openembedded/jtreg-jdk_other.yaml | 7 | ||||
| -rw-r--r-- | openembedded/jtreg-jdk_security1.yaml | 7 | ||||
| -rw-r--r-- | openembedded/jtreg-jdk_text.yaml | 7 | ||||
| -rw-r--r-- | openembedded/jtreg-jdk_time.yaml | 7 | ||||
| -rw-r--r-- | openembedded/jtreg-jdk_util.yaml | 7 | ||||
| -rwxr-xr-x | openembedded/scripts/jtreg-test | 16 |
17 files changed, 26 insertions, 102 deletions
diff --git a/openembedded/jtreg-hotspot-compiler.yaml b/openembedded/jtreg-hotspot-compiler.yaml index 50893fc..0c33c3f 100644 --- a/openembedded/jtreg-hotspot-compiler.yaml +++ b/openembedded/jtreg-hotspot-compiler.yaml @@ -39,9 +39,4 @@ run: steps: - 'PATH=$PWD/jtreg-bin/jtreg/linux/bin:$PATH' - 'cd openembedded/scripts' - - './jtreg-test -t hotspot-compiler -j $JAVA_VM -p $PRODUCT_HOME -- $JTREG_CONC $JTREG_TEST_MODE $JTREG_TIMEOUT -exclude:$JTREG_EXCLUDE_FILE $JTREG_VERBOSE $PRODUCT_HOME/jtreg/hotspot/test/compiler' -parse: - pattern: "(?P<result>^(JTREG-SUCCESS|JTREG-FAIL))\\s+(?P<test_case_id>(.*))" - fixupdict: - JTREG-SUCCESS: pass - JTREG-FAIL: fail + - './jtreg-test -t hotspot-compiler -j $JAVA_VM -p $PRODUCT_HOME -- $JTREG_CONC $JTREG_TEST_MODE $JTREG_TIMEOUT -exclude:$JTREG_EXCLUDE_FILE $JTREG_VERBOSE $PRODUCT_HOME/jtreg/hotspot/test/compiler || true' diff --git a/openembedded/jtreg-hotspot-gc.yaml b/openembedded/jtreg-hotspot-gc.yaml index 70eb6a5..5575e11 100644 --- a/openembedded/jtreg-hotspot-gc.yaml +++ b/openembedded/jtreg-hotspot-gc.yaml @@ -39,9 +39,4 @@ run: steps: - 'PATH=$PWD/jtreg-bin/jtreg/linux/bin:$PATH' - 'cd openembedded/scripts' - - './jtreg-test -t hotspot-gc -j $JAVA_VM -p $PRODUCT_HOME -- $JTREG_CONC $JTREG_TEST_MODE $JTREG_TIMEOUT -exclude:$JTREG_EXCLUDE_FILE $JTREG_VERBOSE $PRODUCT_HOME/jtreg/hotspot/test/gc' -parse: - pattern: "(?P<result>^(JTREG-SUCCESS|JTREG-FAIL))\\s+(?P<test_case_id>(.*))" - fixupdict: - JTREG-SUCCESS: pass - JTREG-FAIL: fail + - './jtreg-test -t hotspot-gc -j $JAVA_VM -p $PRODUCT_HOME -- $JTREG_CONC $JTREG_TEST_MODE $JTREG_TIMEOUT -exclude:$JTREG_EXCLUDE_FILE $JTREG_VERBOSE $PRODUCT_HOME/jtreg/hotspot/test/gc || true' diff --git a/openembedded/jtreg-hotspot-runtime.yaml b/openembedded/jtreg-hotspot-runtime.yaml index 008dc27..84f7054 100644 --- a/openembedded/jtreg-hotspot-runtime.yaml +++ b/openembedded/jtreg-hotspot-runtime.yaml @@ -39,9 +39,4 @@ run: steps: - 'PATH=$PWD/jtreg-bin/jtreg/linux/bin:$PATH' - 'cd openembedded/scripts' - - './jtreg-test -t hotspot-runtime -j $JAVA_VM -p $PRODUCT_HOME -- $JTREG_CONC $JTREG_TEST_MODE $JTREG_TIMEOUT -exclude:$JTREG_EXCLUDE_FILE $JTREG_VERBOSE $PRODUCT_HOME/jtreg/hotspot/test/runtime' -parse: - pattern: "(?P<result>^(JTREG-SUCCESS|JTREG-FAIL))\\s+(?P<test_case_id>(.*))" - fixupdict: - JTREG-SUCCESS: pass - JTREG-FAIL: fail + - './jtreg-test -t hotspot-runtime -j $JAVA_VM -p $PRODUCT_HOME -- $JTREG_CONC $JTREG_TEST_MODE $JTREG_TIMEOUT -exclude:$JTREG_EXCLUDE_FILE $JTREG_VERBOSE $PRODUCT_HOME/jtreg/hotspot/test/runtime || true' diff --git a/openembedded/jtreg-hotspot-sanity.yaml b/openembedded/jtreg-hotspot-sanity.yaml index c9a4b6d..ceae9c0 100644 --- a/openembedded/jtreg-hotspot-sanity.yaml +++ b/openembedded/jtreg-hotspot-sanity.yaml @@ -39,9 +39,4 @@ run: steps: - 'PATH=$PWD/jtreg-bin/jtreg/linux/bin:$PATH' - 'cd openembedded/scripts' - - './jtreg-test -t hotspot-sanity -j $JAVA_VM -p $PRODUCT_HOME -- $JTREG_CONC $JTREG_TEST_MODE $JTREG_TIMEOUT -exclude:$JTREG_EXCLUDE_FILE $JTREG_VERBOSE $PRODUCT_HOME/jtreg/hotspot/test/sanity' -parse: - pattern: "(?P<result>^(JTREG-SUCCESS|JTREG-FAIL))\\s+(?P<test_case_id>(.*))" - fixupdict: - JTREG-SUCCESS: pass - JTREG-FAIL: fail + - './jtreg-test -t hotspot-sanity -j $JAVA_VM -p $PRODUCT_HOME -- $JTREG_CONC $JTREG_TEST_MODE $JTREG_TIMEOUT -exclude:$JTREG_EXCLUDE_FILE $JTREG_VERBOSE $PRODUCT_HOME/jtreg/hotspot/test/sanity || true' diff --git a/openembedded/jtreg-hotspot-serviceability.yaml b/openembedded/jtreg-hotspot-serviceability.yaml index 75108d1..621179e 100644 --- a/openembedded/jtreg-hotspot-serviceability.yaml +++ b/openembedded/jtreg-hotspot-serviceability.yaml @@ -39,9 +39,4 @@ run: steps: - 'PATH=$PWD/jtreg-bin/jtreg/linux/bin:$PATH' - 'cd openembedded/scripts' - - './jtreg-test -t hotspot-serviceability -j $JAVA_VM -p $PRODUCT_HOME -- $JTREG_CONC $JTREG_TEST_MODE $JTREG_TIMEOUT -exclude:$JTREG_EXCLUDE_FILE $JTREG_VERBOSE $PRODUCT_HOME/jtreg/hotspot/test/serviceability' -parse: - pattern: "(?P<result>^(JTREG-SUCCESS|JTREG-FAIL))\\s+(?P<test_case_id>(.*))" - fixupdict: - JTREG-SUCCESS: pass - JTREG-FAIL: fail + - './jtreg-test -t hotspot-serviceability -j $JAVA_VM -p $PRODUCT_HOME -- $JTREG_CONC $JTREG_TEST_MODE $JTREG_TIMEOUT -exclude:$JTREG_EXCLUDE_FILE $JTREG_VERBOSE $PRODUCT_HOME/jtreg/hotspot/test/serviceability || true' diff --git a/openembedded/jtreg-hotspot-testlibrary.yaml b/openembedded/jtreg-hotspot-testlibrary.yaml index 621ffb5..7439043 100644 --- a/openembedded/jtreg-hotspot-testlibrary.yaml +++ b/openembedded/jtreg-hotspot-testlibrary.yaml @@ -39,9 +39,4 @@ run: steps: - 'PATH=$PWD/jtreg-bin/jtreg/linux/bin:$PATH' - 'cd openembedded/scripts' - - './jtreg-test -t hotspot-testlibrary -j $JAVA_VM -p $PRODUCT_HOME -- $JTREG_CONC $JTREG_TEST_MODE $JTREG_TIMEOUT -exclude:$JTREG_EXCLUDE_FILE $JTREG_VERBOSE $PRODUCT_HOME/jtreg/hotspot/test/testlibrary' -parse: - pattern: "(?P<result>^(JTREG-SUCCESS|JTREG-FAIL))\\s+(?P<test_case_id>(.*))" - fixupdict: - JTREG-SUCCESS: pass - JTREG-FAIL: fail + - './jtreg-test -t hotspot-testlibrary -j $JAVA_VM -p $PRODUCT_HOME -- $JTREG_CONC $JTREG_TEST_MODE $JTREG_TIMEOUT -exclude:$JTREG_EXCLUDE_FILE $JTREG_VERBOSE $PRODUCT_HOME/jtreg/hotspot/test/testlibrary || true' diff --git a/openembedded/jtreg-jdk_beans.yaml b/openembedded/jtreg-jdk_beans.yaml index 37813e6..f6a2bed 100644 --- a/openembedded/jtreg-jdk_beans.yaml +++ b/openembedded/jtreg-jdk_beans.yaml @@ -39,9 +39,4 @@ run: steps: - 'PATH=$PWD/jtreg-bin/jtreg/linux/bin:$PATH' - 'cd openembedded/scripts' - - './jtreg-test -t jdk_beans -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/beans' -parse: - pattern: "(?P<result>^(JTREG-SUCCESS|JTREG-FAIL))\\s+(?P<test_case_id>(.*))" - fixupdict: - JTREG-SUCCESS: pass - JTREG-FAIL: fail + - './jtreg-test -t jdk_beans -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/beans || true' diff --git a/openembedded/jtreg-jdk_io.yaml b/openembedded/jtreg-jdk_io.yaml index 71d9771..c2e572f 100644 --- a/openembedded/jtreg-jdk_io.yaml +++ b/openembedded/jtreg-jdk_io.yaml @@ -39,9 +39,4 @@ run: steps: - 'PATH=$PWD/jtreg-bin/jtreg/linux/bin:$PATH' - 'cd openembedded/scripts' - - './jtreg-test -t jdk_io -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/io' -parse: - pattern: "(?P<result>^(JTREG-SUCCESS|JTREG-FAIL))\\s+(?P<test_case_id>(.*))" - fixupdict: - JTREG-SUCCESS: pass - JTREG-FAIL: fail + - './jtreg-test -t jdk_io -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/io || true' diff --git a/openembedded/jtreg-jdk_lang.yaml b/openembedded/jtreg-jdk_lang.yaml index 4404bcb..0841c9e 100644 --- a/openembedded/jtreg-jdk_lang.yaml +++ b/openembedded/jtreg-jdk_lang.yaml @@ -39,9 +39,4 @@ run: steps: - 'PATH=$PWD/jtreg-bin/jtreg/linux/bin:$PATH' - 'cd openembedded/scripts' - - './jtreg-test -t jdk_lang -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/lang' -parse: - pattern: "(?P<result>^(JTREG-SUCCESS|JTREG-FAIL))\\s+(?P<test_case_id>(.*))" - fixupdict: - JTREG-SUCCESS: pass - JTREG-FAIL: fail + - './jtreg-test -t jdk_lang -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/lang || true' diff --git a/openembedded/jtreg-jdk_math.yaml b/openembedded/jtreg-jdk_math.yaml index f719772..d912da0 100644 --- a/openembedded/jtreg-jdk_math.yaml +++ b/openembedded/jtreg-jdk_math.yaml @@ -39,9 +39,4 @@ run: steps: - 'PATH=$PWD/jtreg-bin/jtreg/linux/bin:$PATH' - 'cd openembedded/scripts' - - './jtreg-test -t jdk_math -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/math' -parse: - pattern: "(?P<result>^(JTREG-SUCCESS|JTREG-FAIL))\\s+(?P<test_case_id>(.*))" - fixupdict: - JTREG-SUCCESS: pass - JTREG-FAIL: fail + - './jtreg-test -t jdk_math -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/math || true' diff --git a/openembedded/jtreg-jdk_net.yaml b/openembedded/jtreg-jdk_net.yaml index d734acf..f4b2614 100644 --- a/openembedded/jtreg-jdk_net.yaml +++ b/openembedded/jtreg-jdk_net.yaml @@ -39,9 +39,4 @@ run: steps: - 'PATH=$PWD/jtreg-bin/jtreg/linux/bin:$PATH' - 'cd openembedded/scripts' - - './jtreg-test -t jdk_net -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/net' -parse: - pattern: "(?P<result>^(JTREG-SUCCESS|JTREG-FAIL))\\s+(?P<test_case_id>(.*))" - fixupdict: - JTREG-SUCCESS: pass - JTREG-FAIL: fail + - './jtreg-test -t jdk_net -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/net || true' diff --git a/openembedded/jtreg-jdk_other.yaml b/openembedded/jtreg-jdk_other.yaml index 53b8f3d..34dbaac 100644 --- a/openembedded/jtreg-jdk_other.yaml +++ b/openembedded/jtreg-jdk_other.yaml @@ -39,9 +39,4 @@ run: steps: - 'PATH=$PWD/jtreg-bin/jtreg/linux/bin:$PATH' - 'cd 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<result>^(JTREG-SUCCESS|JTREG-FAIL))\\s+(?P<test_case_id>(.*))" - fixupdict: - JTREG-SUCCESS: pass - JTREG-FAIL: fail + - './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 || true' diff --git a/openembedded/jtreg-jdk_security1.yaml b/openembedded/jtreg-jdk_security1.yaml index ccc458f..af4ea00 100644 --- a/openembedded/jtreg-jdk_security1.yaml +++ b/openembedded/jtreg-jdk_security1.yaml @@ -39,9 +39,4 @@ run: steps: - 'PATH=$PWD/jtreg-bin/jtreg/linux/bin:$PATH' - 'cd openembedded/scripts' - - './jtreg-test -t jdk_security1 -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/security1' -parse: - pattern: "(?P<result>^(JTREG-SUCCESS|JTREG-FAIL))\\s+(?P<test_case_id>(.*))" - fixupdict: - JTREG-SUCCESS: pass - JTREG-FAIL: fail + - './jtreg-test -t jdk_security1 -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/security1 || true' diff --git a/openembedded/jtreg-jdk_text.yaml b/openembedded/jtreg-jdk_text.yaml index 5b82fc1..081942e 100644 --- a/openembedded/jtreg-jdk_text.yaml +++ b/openembedded/jtreg-jdk_text.yaml @@ -39,9 +39,4 @@ run: steps: - 'PATH=$PWD/jtreg-bin/jtreg/linux/bin:$PATH' - 'cd openembedded/scripts' - - './jtreg-test -t jdk_text -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/text' -parse: - pattern: "(?P<result>^(JTREG-SUCCESS|JTREG-FAIL))\\s+(?P<test_case_id>(.*))" - fixupdict: - JTREG-SUCCESS: pass - JTREG-FAIL: fail + - './jtreg-test -t jdk_text -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/text || true' diff --git a/openembedded/jtreg-jdk_time.yaml b/openembedded/jtreg-jdk_time.yaml index cafbe5a..aab5077 100644 --- a/openembedded/jtreg-jdk_time.yaml +++ b/openembedded/jtreg-jdk_time.yaml @@ -39,9 +39,4 @@ run: steps: - 'PATH=$PWD/jtreg-bin/jtreg/linux/bin:$PATH' - 'cd openembedded/scripts' - - './jtreg-test -t jdk_time -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/time' -parse: - pattern: "(?P<result>^(JTREG-SUCCESS|JTREG-FAIL))\\s+(?P<test_case_id>(.*))" - fixupdict: - JTREG-SUCCESS: pass - JTREG-FAIL: fail + - './jtreg-test -t jdk_time -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/time || true' diff --git a/openembedded/jtreg-jdk_util.yaml b/openembedded/jtreg-jdk_util.yaml index fff01e0..cb5b8bd 100644 --- a/openembedded/jtreg-jdk_util.yaml +++ b/openembedded/jtreg-jdk_util.yaml @@ -39,9 +39,4 @@ run: steps: - 'PATH=$PWD/jtreg-bin/jtreg/linux/bin:$PATH' - 'cd openembedded/scripts' - - './jtreg-test -t jdk_util -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/util' -parse: - pattern: "(?P<result>^(JTREG-SUCCESS|JTREG-FAIL))\\s+(?P<test_case_id>(.*))" - fixupdict: - JTREG-SUCCESS: pass - JTREG-FAIL: fail + - './jtreg-test -t jdk_util -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/util || true' diff --git a/openembedded/scripts/jtreg-test b/openembedded/scripts/jtreg-test index 421c076..9503702 100755 --- a/openembedded/scripts/jtreg-test +++ b/openembedded/scripts/jtreg-test @@ -77,18 +77,22 @@ shopt -s nullglob process_file() { local filename=$1 local result=$2 - while read -r line; do - tc=$(echo $line | awk '{print $1}') + local ofile=/tmp/jtreg-test-process-file.$$ + echo "#!/bin/bash" > $ofile + while IFS=' ' read -r tc rem; do y=$(dirname $tc) z=$(basename $tc .java) test_result=$output_dir/JTwork/$y/${z}.jtr + echo "lava-test-case $z --result $result" >> $ofile if [ -e $test_result ]; then - pushd $output_dir/JTwork - lava-test-case $z --result $result - lava-test-case-attach $z $y/${z}.jtr text/plain - popd + echo "pushd $output_dir/JTwork >/dev/null" >> $ofile + echo "lava-test-case-attach $z $y/${z}.jtr text/plain" >> $ofile + echo "popd > /dev/null" >> $ofile fi done < $filename + [ -e $ofile ] && chmod 755 $ofile + [ -e $ofile ] && $ofile + rm -f $ofile } if [ -d $output_dir/JTreport/text ]; then |