diff --git a/test/reproducers/567404/UpstreamRhinoClassPathTest.java b/test/reproducers/567404/UpstreamRhinoClassPathTest.java index 4f8989d..ef68e4f 100644 --- a/test/reproducers/567404/UpstreamRhinoClassPathTest.java +++ b/test/reproducers/567404/UpstreamRhinoClassPathTest.java @@ -1,5 +1,3 @@ - - import org.mozilla.javascript.NativeCall; /** diff --git a/test/reproducers/567404/runtest.sh b/test/reproducers/567404/runtest.sh index e874ce8..6c1a49c 100755 --- a/test/reproducers/567404/runtest.sh +++ b/test/reproducers/567404/runtest.sh @@ -9,7 +9,7 @@ fi $JAVAC -d . $TESTSRC/TestScript.java R=$? -if [[ $R -ne 0 ]] ; then +if [ "0$R" -ne "0" ] ; then echo "Compilation1 failed" exit $R fi @@ -18,14 +18,14 @@ $JAVA -cp . TestScript &> log1 #$TESTSRC/rhino-1.5r5.jar ? R=$? cat log1 -if [[ $R -ne 0 ]] ; then +if [ "0$R" -ne "0" ] ; then echo "Run1 failed" exit $R fi grep "Scripting components FOUND successfully." log1 R=$? -if [[ $R -ne 0 ]] ; then +if [ "0$R" -ne "0" ] ; then echo "grep1 failed" exit $R fi @@ -33,7 +33,7 @@ fi $JAVAC -d . -cp $TESTSRC/rhino-1.5r5.jar $TESTSRC/UpstreamRhinoClassPathTest.java &> log2 R=$? cat log2 -if [[ $R -ne 0 ]] ; then +if [ "0$R" -ne "0" ] ; then echo "Compilation2 failed" exit $R fi @@ -41,11 +41,11 @@ fi cat log2 ls -l -if [[ ! -z `cat log2 | grep -v \ +if [ ! -z `cat log2 | grep -v \ -e "^Picked up JAVA_TOOL_OPTIONS:" \ -e "^Started recording" \ -e "myrecording.jfr$" ` - ]] ; then + ] ; then echo "Empty output" exit 100 fi diff --git a/test/reproducers/6656625/Test.sh b/test/reproducers/6656625/Test.sh index 624a44c..22ab26d 100644 --- a/test/reproducers/6656625/Test.sh +++ b/test/reproducers/6656625/Test.sh @@ -6,20 +6,20 @@ JAVA=${TESTJAVA}${FS}bin${FS}java $JAVAC -d . $TESTSRC/Test.java R=$? -if [[ $R -ne 0 ]] ; then +if [ "0$R" -ne "0" ] ; then echo "Compilation failed" exit $R fi cp -v $TESTSRC/test.png . R=$? -if [[ $R -ne 0 ]] ; then +if [ "0$R" -ne "0" ] ; then echo "Copy of resource failed" exit $R fi $JAVA Test R=$? -if [[ $R -ne 0 ]] ; then +if [ "0$R" -ne "0" ] ; then echo "run failed" exit $R fi @@ -27,7 +27,7 @@ fi ls test.png R=$? -if [[ $R -ne 0 ]] ; then +if [ "0$R" -ne "0" ] ; then echo "no image here" exit $R fi diff --git a/test/reproducers/6804996/Test.sh b/test/reproducers/6804996/Test.sh index ab54bef..f0b7065 100644 --- a/test/reproducers/6804996/Test.sh +++ b/test/reproducers/6804996/Test.sh @@ -6,40 +6,40 @@ JAVA=${TESTJAVA}${FS}bin${FS}java $JAVAC -d . $TESTSRC/Test.java R=$? -if [[ $R -ne 0 ]] ; then +if [ "0$R" -ne "0" ] ; then echo "Compilation failed" exit $R fi cp -v $TESTSRC/splash.png . R=$? -if [[ $R -ne 0 ]] ; then +if [ "0$R" -ne "0" ] ; then echo "Copy of resource failed" exit $R fi $JAVA -splash:splash.png -showversion Test > LOG R=$? -if [[ $R -ne 0 ]] ; then +if [ "0$R" -ne "0" ] ; then echo "run failed" exit $R fi cat LOG R=$? -if [[ $R -ne 0 ]] ; then +if [ "0$R" -ne "0" ] ; then echo "no log" exit $R fi grep splash.png LOG -if [[ $R -ne 0 ]] ; then +if [ "0$R" -ne "0" ] ; then echo "no spalsh in log" exit $R fi grep "done" LOG R=$? -if [[ $R -ne 0 ]] ; then +if [ "0$R" -ne "0" ] ; then echo "testnot done" exit $R fi diff --git a/test/reproducers/6804998/Test.sh b/test/reproducers/6804998/Test.sh index 0cdddbc..ab9620d 100644 --- a/test/reproducers/6804998/Test.sh +++ b/test/reproducers/6804998/Test.sh @@ -6,20 +6,20 @@ JAVA=${TESTJAVA}${FS}bin${FS}java $JAVAC -d . $TESTSRC/Test.java R=$? -if [[ $R -ne 0 ]] ; then +if [ "0$R" -ne "0" ] ; then echo "Compilation failed" exit $R fi cp -v $TESTSRC/test.gif . R=$? -if [[ $R -ne 0 ]] ; then +if [ "0$R" -ne "0" ] ; then echo "Copy of resource failed" exit $R fi $JAVA Test R=$? -if [[ $R -ne 0 ]] ; then +if [ "0$R" -ne "0" ] ; then echo "run failed" exit $R fi @@ -27,7 +27,7 @@ fi ls test.gif R=$? -if [[ $R -ne 0 ]] ; then +if [ "0$R" -ne "0" ] ; then echo "no image here" exit $R fi diff --git a/test/reproducers/6823373/Test.sh b/test/reproducers/6823373/Test.sh index c1fca5d..43387fa 100644 --- a/test/reproducers/6823373/Test.sh +++ b/test/reproducers/6823373/Test.sh @@ -6,40 +6,40 @@ JAVA=${TESTJAVA}${FS}bin${FS}java $JAVAC -d . $TESTSRC/Test.java R=$? -if [[ $R -ne 0 ]] ; then +if [ "0$R" -ne "0" ] ; then echo "Compilation failed" exit $R fi cp -v $TESTSRC/splash.jpg . R=$? -if [[ $R -ne 0 ]] ; then +if [ "0$R" -ne "0" ] ; then echo "Copy of resource failed" exit $R fi $JAVA -splash:splash.jpg -showversion Test > LOG R=$? -if [[ $R -ne 0 ]] ; then +if [ "0$R" -ne "0" ] ; then echo "run failed" exit $R fi cat LOG R=$? -if [[ $R -ne 0 ]] ; then +if [ "0$R" -ne "0" ] ; then echo "no log" exit $R fi grep splash.jpg LOG -if [[ $R -ne 0 ]] ; then +if [ "0$R" -ne "0" ] ; then echo "no spalsh in log" exit $R fi grep "done" LOG R=$? -if [[ $R -ne 0 ]] ; then +if [ "0$R" -ne "0" ] ; then echo "testnot done" exit $R fi diff --git a/test/reproducers/6913047/run.sh b/test/reproducers/6913047/run.sh index b4e479a..4e1ed09 100644 --- a/test/reproducers/6913047/run.sh +++ b/test/reproducers/6913047/run.sh @@ -65,7 +65,7 @@ fi "$JAVAC" -d . $TESTSRC/Bug6913047.java $EXTFLAGS R=$? -if [[ $R -ne 0 ]]; then +if [ "0$R" -ne "0" ]; then echo "Compilation failed" exit $R else diff --git a/test/reproducers/7122141/runtest.sh b/test/reproducers/7122141/runtest.sh index aa51d8a..27d9b57 100755 --- a/test/reproducers/7122141/runtest.sh +++ b/test/reproducers/7122141/runtest.sh @@ -4,7 +4,7 @@ JAVA=${TESTJAVA}${FS}bin${FS}java $JAVAC -d . $(find $TESTSRC/annotationinitialisationrace -name \*.java) R=$? -if [[ $R -ne 0 ]] ; then +if [ "0$R" -ne "0" ] ; then echo "Compilation1 failed" exit $R fi @@ -13,7 +13,7 @@ java_pid=$! sleep 5; ps | grep $java_pid R=$? - if [[ $R -eq 0 ]]; then + if [ "0$R" -eq "0" ]; then echo "java not finished, see kill -3 bellow" kill -3 $java_pid # write info about process kill -9 $java_pid # kill it with fire