# HG changeset patch
# User dsamersoff
# Date 1460557170 0
# Node ID e83b85f957c91be1920c7e05e23932f8186b8ecf
# Parent  868c7195632cb5525652584d974b1a93f0d942a4# Parent  059353096b4edf8c503de5018b045e1ca26beef8
Merge

diff -r 868c7195632c -r e83b85f957c9 jdk/test/com/sun/jdi/ShellScaffold.sh
--- a/jdk/test/com/sun/jdi/ShellScaffold.sh	Wed Apr 13 11:13:15 2016 +0200
+++ b/jdk/test/com/sun/jdi/ShellScaffold.sh	Wed Apr 13 14:19:30 2016 +0000
@@ -924,7 +924,7 @@
         # If jstack exists, so will jps
         # Show stack traces of jdb and debuggee as a possible debugging aid.
         jdbCmd=`$jdk/bin/jps -v | $grep $jdbKeyword`
-        realJdbPid=`echo "$jdbCmd" | sed -e 's@ TTY.*@@'`
+        realJdbPid=`echo "$jdbCmd" | sed -e 's@ .*@@'`
         if [ ! -z "$realJdbPid" ] ; then
             echo "-- jdb process info ----------------------" >&2
             echo "      $jdbCmd"                              >&2