equal
deleted
inserted
replaced
35 then |
35 then |
36 echo "TESTJAVA not set. Test cannot execute. Failed." |
36 echo "TESTJAVA not set. Test cannot execute. Failed." |
37 exit 1 |
37 exit 1 |
38 fi |
38 fi |
39 |
39 |
|
40 if [ "${COMPILEJAVA}" = "" ]; then |
|
41 COMPILEJAVA="${TESTJAVA}" |
|
42 fi |
|
43 |
40 if [ "${TESTSRC}" = "" ] |
44 if [ "${TESTSRC}" = "" ] |
41 then |
45 then |
42 echo "TESTSRC not set. Test cannot execute. Failed." |
46 echo "TESTSRC not set. Test cannot execute. Failed." |
43 exit 1 |
47 exit 1 |
44 fi |
48 fi |
49 exit 1 |
53 exit 1 |
50 fi |
54 fi |
51 |
55 |
52 JAVAEXE="$TESTJAVA/bin/java ${TESTVMOPTS}" |
56 JAVAEXE="$TESTJAVA/bin/java ${TESTVMOPTS}" |
53 JAVA="$TESTJAVA/bin/java ${TESTVMOPTS} -classpath $TESTCLASSES" |
57 JAVA="$TESTJAVA/bin/java ${TESTVMOPTS} -classpath $TESTCLASSES" |
54 JAR="$TESTJAVA/bin/jar" |
58 JAR="$COMPILEJAVA/bin/jar ${TESTTOOLVMOPTS}" |
55 OS=`uname -s`; |
59 OS=`uname -s`; |
56 |
60 |
57 # |
61 # |
58 # Tests whether we are on windows (true) or not. |
62 # Tests whether we are on windows (true) or not. |
59 # |
63 # |