aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVitaly Provodin <vitaly.provodin@jetbrains.com>2018-04-03 14:39:49 +0700
committerVitaly Provodin <vitaly.provodin@jetbrains.com>2018-04-03 14:39:49 +0700
commitab603f2259f832c01cd5452453faa0fdb5038c64 (patch)
treeda56f7e2c8d8311f2e9daac895202b0f3318e516
parent62000130d86e5831d81cfb24659386c6930f84cf (diff)
downloadjdk8u_jdk-jb8u152-b1215.tar.gz
JRE-717 fixed the issue integer expression expectedjb8u152-b1215
-rwxr-xr-xtest/jb/sun/lwawt/macosx/LWCToolkit/lwctoolkit.sh13
1 files changed, 11 insertions, 2 deletions
diff --git a/test/jb/sun/lwawt/macosx/LWCToolkit/lwctoolkit.sh b/test/jb/sun/lwawt/macosx/LWCToolkit/lwctoolkit.sh
index 43447f14fb..aa088ac311 100755
--- a/test/jb/sun/lwawt/macosx/LWCToolkit/lwctoolkit.sh
+++ b/test/jb/sun/lwawt/macosx/LWCToolkit/lwctoolkit.sh
@@ -66,10 +66,19 @@ echo "Running workload"
${TESTJAVA}/bin/java -XX:+ExtendedDTraceProbes -cp ${TESTCLASSES} LWCToolkit ${ITERATIONS} &
TEST_PID=$!
-DTRACE_OUTPUT=$(echo ${BUPWD} | sudo -S ${DTRACE} -q -p${TEST_PID} -s ${TESTSRC}/lwctoolkit.d | grep "LWCToolkit" | grep " invokeAndWait")
+DTRACE_OUTPUT=$(echo ${BUPWD} | sudo -S ${DTRACE} -p${TEST_PID} -s ${TESTSRC}/lwctoolkit.d)
+echo "=dtrace output==========================="
echo $DTRACE_OUTPUT
+echo "========================================="
-count=$(echo ${DTRACE_OUTPUT} | awk {'print $3'})
+METHOD_LINE=$(echo ${DTRACE_OUTPUT} | grep "LWCToolkit" | grep " invokeAndWait")
+
+if [ -z "${METHOD_LINE}" ]; then
+ echo "LWCToolkit.invokeAndWait is not contained in dtrace's output"
+ count=0
+else
+ count=$(echo ${METHOD_LINE} | awk {'print $3'})
+fi
if [ "${count}" -lt "100" ]; then
echo "Test PASSED"