Skip to content

Commit 3a15c95

Browse files
committed
trying to run with the new JRE fix
1 parent f2f3952 commit 3a15c95

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

testHeadlessComponents.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -174,19 +174,19 @@ LOGFILE=$TMPRESULTS/testHeadlessComponent.log
174174

175175
installAlternativeJDK
176176

177-
JAVAC_BINARY="${BOOTJDK_DIR}/bin/javac"
178-
if [ "$OS" == "mac" ]; then
177+
JAVAC_BINARY="${JAVA_COMMAND}c"
178+
if [ "$OS" == "mac1" ]; then
179179
JAVAC_BINARY="${BOOTJDK_DIR}/Contents/Home/bin/javac"
180180
fi
181-
181+
JAVA=$JAVA_TO_TEST
182182
#use bootjdk javac
183183
#other classes depend on this one, so we might as well just compile the main class
184184
cp -r $SCRIPT_DIR/testHeadlessComponents $WORKSPACE
185185
ls $WORKSPACE
186186
pushd $WORKSPACE/testHeadlessComponents/jreTestingSwingComponents/src
187187

188-
echo "JAVA_TO_TEST=$JAVA_TO_TEST"
189-
echo "javac=${JAVA_COMMAND}c"
188+
echo "JAVA=$JAVA"
189+
echo "javac=$JAVAC_BINARY"
190190

191191
cp=`mktemp -d`
192192
$JAVAC_BINARY `find . -type f -name "*.java"` -d $cp

0 commit comments

Comments
 (0)