From 4e48b4ce334cb601dbbe2562e3aa410dc3ef3fba Mon Sep 17 00:00:00 2001
From: Jim Meyering <jim@meyering.net>
Date: Fri, 15 Dec 2006 10:43:20 +0100
Subject: * tests/cp/open-perm-race: Correct the gdb-existence check. Don't run
 either subsequent gdb command in a sub-shell. Reported by Thomas Schwinge. *
 THANKS: bring up to date.

---
 tests/cp/open-perm-race | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'tests/cp')

diff --git a/tests/cp/open-perm-race b/tests/cp/open-perm-race
index b09776a82..970d7e8c4 100755
--- a/tests/cp/open-perm-race
+++ b/tests/cp/open-perm-race
@@ -48,16 +48,17 @@ mkdir d && chgrp $group_2 d && chmod g+s,g-w d || framework_failure=1
 touch file && chmod go+w file                  || framework_failure=1
 
 ( gdb --version ) > gdb.out 2>&1
-if test ! -s gdb.out; then
-  echo "$0: can't run gdb.  Skipping this test." 1>&2
-  (exit 77); exit 77
-fi
+case `cat gdb.out` in
+  'GNU gdb'*) ;;
+  *) echo "$0: can't run gdb.  Skipping this test." 1>&2;
+     (exit 77); exit 77;;
+esac
 
-( gdb -nx --batch-silent		\
+gdb -nx --batch-silent			\
     --eval-command='break copy_reg'	\
     --eval-command='break open_safer'	\
     --eval-command='quit'		\
-    $abs_top_builddir/src/cp < /dev/null ) > gdb.out 2>&1
+    $abs_top_builddir/src/cp < /dev/null > gdb.out 2>&1
 if test -s gdb.out; then
   cat <<EOF 1>&2
 $0: can't set breakpoints in cp.  Skipping this test.
@@ -80,8 +81,8 @@ if test $framework_failure = 1; then
   (exit 1); exit 1
 fi
 
-( gdb -nx --batch-silent --command=gdb-cmd --args \
-    $abs_top_builddir/src/cp -p file d ) > gdb.out 2>&1
+gdb -nx --batch-silent --command=gdb-cmd --args \
+    $abs_top_builddir/src/cp -p file d > gdb.out 2>&1
 # Expect no output.
 
 if test -s gdb.out; then
-- 
cgit v1.2.3-70-g09d2