Skip to content

Commit f7a590d

Browse files
committed
Adapted scala test for JAVA_TOOL_OPTIONS
Scala testsuite is nitpicking,and is matching outputs JAVA_TOOL_OPTIONS are captured, and so it do not math Am now tmepting the match file with Picked up.... from java --version if it JAVA_TOOL_OPTIONS is decalred
1 parent 8af9789 commit f7a590d

1 file changed

Lines changed: 7 additions & 0 deletions

File tree

jni/scala_partest_natives.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,13 @@ pushd $sub
1010
git clone https://github.com/judovana/scala.git scala-$scalav
1111
pushd scala-$scalav
1212
git checkout jdk11AndUpNatives
13+
mach_file=./test/files/jvm/natives.check
14+
if $JAVA_HOME/bin/java -version 2>&1 | grep Picked ; then
15+
orig_mach_file_content=`cat ./test/files/jvm/natives.check`
16+
$JAVA_HOME/bin/java -version 2>&1 | grep Picked > $mach_file
17+
echo $orig_mach_file_content >> $mach_file
18+
cat ./test/files/jvm/natives.check
19+
fi
1320
../sbt/bin/sbt --java-home $JAVA_HOME --no-colors "partest --debug test/files/jvm/natives.scala" || echo "generated classes should be ok even in case of (most likely) failure"
1421
pushd test/files/jvm
1522
rm -v libnatives*.so

0 commit comments

Comments
 (0)