Skip gdbserver tests if ./configure did not find gdb.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11752

diff --git a/gdbserver_tests/mcbreak.vgtest b/gdbserver_tests/mcbreak.vgtest
index 41ea5e3c4aa49bca36deeb1bceb84e999a5bb09d..f413268cbab23972c576129088f7170520a47940 100644 (file)
--- a/gdbserver_tests/mcbreak.vgtest
+++ b/gdbserver_tests/mcbreak.vgtest
@@ -1,5 +1,6 @@
 # test execution control (break, next, step) and inferior calls
 # when stopped on these events
+prereq: test -e gdb
 prog: t
 vgopts: --tool=memcheck --vgdb=yes --vgdb-error=0 --vgdb-prefix=./vgdb-prefix-mcbreak
 stdout_filter: filter_gdb

diff --git a/gdbserver_tests/mcclean_after_fork.vgtest b/gdbserver_tests/mcclean_after_fork.vgtest
index d953ed798623bc35328fb71c4674a19ed8f1b3c2..25ca471323ad5b46857cbb7f3c9b4c57395d4f98 100644 (file)
--- a/gdbserver_tests/mcclean_after_fork.vgtest
+++ b/gdbserver_tests/mcclean_after_fork.vgtest
@@ -1,4 +1,5 @@
 # test cleanup of break and watchpoints after fork
+prereq: test -e gdb
 prog: clean_after_fork
 vgopts: --tool=memcheck --vgdb=full --vgdb-error=0 --vgdb-prefix=./vgdb-prefix-mcclean_after_fork
 stderr_filter: filter_memcheck_monitor

diff --git a/gdbserver_tests/mchelp.vgtest b/gdbserver_tests/mchelp.vgtest
index 9f88c4980612dfd0947a7908dca6f1b142ca7b6a..1904b68fcb6672b1304b6dd9818b9e41e9d838b5 100644 (file)
--- a/gdbserver_tests/mchelp.vgtest
+++ b/gdbserver_tests/mchelp.vgtest
@@ -1,4 +1,5 @@
 # test the memcheck monitor help
+prereq: test -e gdb
 prog: t
 vgopts: --tool=memcheck --vgdb=yes --vgdb-error=0 --vgdb-prefix=./vgdb-prefix-mchelp
 stdout_filter: filter_make_empty

diff --git a/gdbserver_tests/mcinfcallRU.vgtest b/gdbserver_tests/mcinfcallRU.vgtest
index d8f54d3e76ea8bda25c15f3adcf2945bed00f50e..aff2109f605b212a48cc6536285757a0b32e2af6 100644 (file)
--- a/gdbserver_tests/mcinfcallRU.vgtest
+++ b/gdbserver_tests/mcinfcallRU.vgtest
@@ -9,7 +9,7 @@ vgopts: --tool=memcheck --vgdb=yes --vgdb-error=0 --vgdb-prefix=./vgdb-prefix-mc
 # but no way to check that this is effectively in the 4 different threads.
 stderr_filter: filter_gdb
 # Disable on Darwin: inferior call rejected as it cannot find malloc.
-prereq: ../tests/os_test linux
+prereq: test -e gdb && ../tests/os_test linux
 progB: gdb
 argsB:  --quiet -l 60 --nx ./sleepers
 stdinB: mcinfcallRU.stdinB.gdb

diff --git a/gdbserver_tests/mcinfcallWSRU.vgtest b/gdbserver_tests/mcinfcallWSRU.vgtest
index 683be0229d611e5c22882975b2012751688e4086..1b19cc76e78758bf7800e4d396ca78c784baa019 100644 (file)
--- a/gdbserver_tests/mcinfcallWSRU.vgtest
+++ b/gdbserver_tests/mcinfcallWSRU.vgtest
@@ -6,7 +6,7 @@ prog: sleepers
 args: 100 100000000 1000000000 -S-S-SB-
 vgopts: --tool=memcheck --vgdb=yes --vgdb-error=0 --vgdb-prefix=./vgdb-prefix-mcinfcallWSRU
 # Disable on Darwin: inferior call rejected as it cannot find malloc.
-prereq: ../tests/os_test linux
+prereq: test -e gdb && ../tests/os_test linux
 # filter_gdb to replace pid and Thread numbers.
 stderr_filter: filter_gdb
 progB: gdb

diff --git a/gdbserver_tests/mcinvokeRU.vgtest b/gdbserver_tests/mcinvokeRU.vgtest
index ab933bbe709c797d7a3e7bf71fea42450bf41556..e4df176b49dc35f0e824440634ae8c8f0af899d9 100644 (file)
--- a/gdbserver_tests/mcinvokeRU.vgtest
+++ b/gdbserver_tests/mcinvokeRU.vgtest
@@ -5,6 +5,7 @@ args: 1 0 1000000000 B-B-B-B-
 vgopts: --tool=memcheck --vgdb=yes --vgdb-prefix=./vgdb-prefix-mcinvokeRU
 stderr_filter: filter_make_empty
 # as the Valgrind process is always busy, we do not need the vgdb.ptraceinvoker prereq.
+prereq: test -e gdb
 progB: invoker
 argsB: 10 --vgdb-prefix=./vgdb-prefix-mcinvokeRU --wait=60 -c vg.wait 0
 # if the --wait is not enough, the test will fail or block.

diff --git a/gdbserver_tests/mcinvokeWS.vgtest b/gdbserver_tests/mcinvokeWS.vgtest
index 1be48e837e98f58ce61c0670e63deaaf7abca57d..d384cf03e99e1d9e7c00fc21f382fb635bdc7f1c 100644 (file)
--- a/gdbserver_tests/mcinvokeWS.vgtest
+++ b/gdbserver_tests/mcinvokeWS.vgtest
@@ -4,7 +4,7 @@ prog: sleepers
 args: 1 10000000 0 -S-S-S-S
 vgopts: --tool=memcheck --vgdb=yes --vgdb-prefix=./vgdb-prefix-mcinvokeWS
 stderr_filter: filter_make_empty
-prereq: test -f vgdb.ptraceinvoker
+prereq: test -e gdb -a -f vgdb.ptraceinvoker
 progB: invoker
 argsB: 10 --vgdb-prefix=./vgdb-prefix-mcinvokeWS --wait=60 -c vg.wait 0
 # if the --wait is not enough, the test will fail or block

diff --git a/gdbserver_tests/mcleak.vgtest b/gdbserver_tests/mcleak.vgtest
index 3cdd1ea47a43c0bd440c7afb6284021c09607396..71d87bc2814381e7c66331a415b2d5e41b95b7da 100644 (file)
--- a/gdbserver_tests/mcleak.vgtest
+++ b/gdbserver_tests/mcleak.vgtest
@@ -2,7 +2,7 @@
 prog: ../memcheck/tests/leak-delta
 vgopts: --tool=memcheck --vgdb=yes --vgdb-error=0 --vgdb-prefix=./vgdb-prefix-mcleak -q --leak-check=yes --show-reachable=yes --leak-resolution=high
 # temorarily disabled, waiting for leak-delta test program (next patch)
-prereq: test -x ../memcheck/tests/leak-delta
+prereq: test -e gdb -a -x ../memcheck/tests/leak-delta
 stdout_filter: filter_memcheck_monitor
 stderr_filter: filter_memcheck_monitor
 progB: gdb

diff --git a/gdbserver_tests/mcsignopass.vgtest b/gdbserver_tests/mcsignopass.vgtest
index 257ca58e8e53f531d97b04d6a8ab2970e37f7d8f..025be5f462381894139c971737209ae67a1a6804 100644 (file)
--- a/gdbserver_tests/mcsignopass.vgtest
+++ b/gdbserver_tests/mcsignopass.vgtest
@@ -4,6 +4,7 @@
 #   faultstatus C code will report a failure for the signal not passed
 #      (i.e. SIGBUG, Test 3). Other tests will be succesful, because signals
 #      are eventually passed.
+prereq: test -e gdb
 prog: ../none/tests/faultstatus
 vgopts: --tool=memcheck --vgdb=full --vgdb-error=0 --vgdb-prefix=./vgdb-prefix-mcsignopass
 stderr_filter: filter_memcheck_monitor

diff --git a/gdbserver_tests/mcsigpass.vgtest b/gdbserver_tests/mcsigpass.vgtest
index a5501583e8cae3e01e75560a633b9c2455ee79b1..3df874b4bf5c1516543a6a3640ad2d1ee8129e91 100644 (file)
--- a/gdbserver_tests/mcsigpass.vgtest
+++ b/gdbserver_tests/mcsigpass.vgtest
@@ -1,4 +1,5 @@
 # test the signal handling, when signals are passed to the Valgrind guest.
+prereq: test -e gdb
 prog: ../none/tests/faultstatus
 vgopts: --tool=memcheck --vgdb=full --vgdb-error=0 --vgdb-prefix=./vgdb-prefix-mcsigpass
 stderr_filter: filter_memcheck_monitor

diff --git a/gdbserver_tests/mcvabits.vgtest b/gdbserver_tests/mcvabits.vgtest
index 689c26f7712a77e9fa633d5e60025151c534450a..48b35e8a3ab9d09825e662fd7b7f4160b0166fc4 100644 (file)
--- a/gdbserver_tests/mcvabits.vgtest
+++ b/gdbserver_tests/mcvabits.vgtest
@@ -1,4 +1,5 @@
 # test the memcheck V and A bits monitor functionality
+prereq: test -e gdb
 prog: t
 vgopts: --tool=memcheck --vgdb=yes --vgdb-error=0 --vgdb-prefix=./vgdb-prefix-mcvabits
 stdout_filter: filter_make_empty

diff --git a/gdbserver_tests/mcwatchpoints.vgtest b/gdbserver_tests/mcwatchpoints.vgtest
index 72714ebadee761f617dd1e100f431033248929db..f50405327a633729bdc04b9b1c272fcabd70e20f 100644 (file)
--- a/gdbserver_tests/mcwatchpoints.vgtest
+++ b/gdbserver_tests/mcwatchpoints.vgtest
@@ -1,5 +1,6 @@
 # test the memcheck watchpoint functionality
 # Note: we need --vgdb=full to stop at the instruction following the watchpoint.
+prereq: test -e gdb
 prog: watchpoints
 vgopts: --tool=memcheck --vgdb=full --vgdb-error=0 --vgdb-prefix=./vgdb-prefix-mcwatchpoints
 stdout_filter: filter_make_empty

diff --git a/gdbserver_tests/mssnapshot.vgtest b/gdbserver_tests/mssnapshot.vgtest
index a11a04df5d48061ed30fec964f44effe8267d4e6..cc111b1ddbb7fa7c5a95c3f7ef5cc82d83579427 100644 (file)
--- a/gdbserver_tests/mssnapshot.vgtest
+++ b/gdbserver_tests/mssnapshot.vgtest
@@ -1,4 +1,5 @@
 # test the memcheck monitor help
+prereq: test -e gdb
 prog: t
 vgopts: --tool=massif --vgdb=yes --vgdb-error=0 --vgdb-prefix=./vgdb-prefix-mssnapshot
 stdout_filter: filter_make_empty

diff --git a/gdbserver_tests/nlcontrolc.vgtest b/gdbserver_tests/nlcontrolc.vgtest
index 6c059010a24b22fe8bd3034f0d44a809d7f405f6..6a36cc238ed49ef96dd321a5739c7914f85bf0e3 100644 (file)
--- a/gdbserver_tests/nlcontrolc.vgtest
+++ b/gdbserver_tests/nlcontrolc.vgtest
@@ -10,7 +10,7 @@ prog: sleepers
 args: 1000000000 1000000000 1000000000 BSBSBSBS
 vgopts: --tool=none --vgdb=yes --vgdb-error=0 --vgdb-prefix=./vgdb-prefix-nlcontrolc
 stderr_filter: filter_stderr
-prereq: test -f vgdb.ptraceinvoker
+prereq: test -e gdb -a -f vgdb.ptraceinvoker
 progB: gdb
 argsB: --quiet -l 60 --nx ./sleepers
 stdinB: nlcontrolc.stdinB.gdb