equal
deleted
inserted
replaced
7 # The script relies on Bash arrays, rerun in Bash. |
7 # The script relies on Bash arrays, rerun in Bash. |
8 /bin/bash $0 $@ |
8 /bin/bash $0 $@ |
9 exit |
9 exit |
10 fi |
10 fi |
11 |
11 |
12 classes=( "$@" ) |
|
13 sources=() |
12 sources=() |
14 for c in "${classes[@]}"; do |
13 classes=() |
15 sources+=( "${TESTSRC}/$(echo $c | sed -e 's|\.|/|g').java" ) |
14 for s in $(find "${TESTSRC}" -name "*.java" | grep -v junit.java); do |
|
15 sources+=( "$s" ) |
|
16 classes+=( $(echo "$s" | sed -e "s|${TESTSRC}/||" -e 's|/|.|g' -e 's/.java$//') ) |
16 done |
17 done |
17 |
18 |
18 common_args=(\ |
19 common_args=(\ |
19 --patch-module jdk.jpackage="${TESTSRC}${PS}${TESTCLASSES}" \ |
20 --patch-module jdk.jpackage="${TESTSRC}${PS}${TESTCLASSES}" \ |
20 --add-reads jdk.jpackage=ALL-UNNAMED \ |
21 --add-reads jdk.jpackage=ALL-UNNAMED \ |
26 "${COMPILEJAVA}/bin/javac" ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} \ |
27 "${COMPILEJAVA}/bin/javac" ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} \ |
27 "${common_args[@]}" -d "${TESTCLASSES}" "${sources[@]}" |
28 "${common_args[@]}" -d "${TESTCLASSES}" "${sources[@]}" |
28 |
29 |
29 # Run junit |
30 # Run junit |
30 "${TESTJAVA}/bin/java" ${TESTVMOPTS} ${TESTJAVAOPTS} \ |
31 "${TESTJAVA}/bin/java" ${TESTVMOPTS} ${TESTJAVAOPTS} \ |
31 "${common_args[@]}" org.junit.runner.JUnitCore "$@" |
32 "${common_args[@]}" org.junit.runner.JUnitCore "${classes[@]}" |