From: Bart Van Assche Date: Sun, 15 May 2011 06:07:57 +0000 (+0000) Subject: Skip gdbserver tests if ./configure did not find gdb. X-Git-Tag: svn/VALGRIND_3_7_0~485 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75f462e649ab64f767ad11c3e1e2121f4e46e725;p=thirdparty%2Fvalgrind.git 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 41ea5e3c4a..f413268cba 100644 --- 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 d953ed7986..25ca471323 100644 --- 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 9f88c49806..1904b68fcb 100644 --- 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 d8f54d3e76..aff2109f60 100644 --- 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 683be0229d..1b19cc76e7 100644 --- 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 ab933bbe70..e4df176b49 100644 --- 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 1be48e837e..d384cf03e9 100644 --- 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 3cdd1ea47a..71d87bc281 100644 --- 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 257ca58e8e..025be5f462 100644 --- 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 a5501583e8..3df874b4bf 100644 --- 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 689c26f771..48b35e8a3a 100644 --- 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 72714ebade..f50405327a 100644 --- 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 a11a04df5d..cc111b1ddb 100644 --- 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 6c059010a2..6a36cc238e 100644 --- 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