|
From: <sv...@va...> - 2011-05-15 06:08:05
|
Author: bart Date: 2011-05-15 07:07:57 +0100 (Sun, 15 May 2011) New Revision: 11752 Log: Skip gdbserver tests if ./configure did not find gdb. Modified: trunk/gdbserver_tests/mcbreak.vgtest trunk/gdbserver_tests/mcclean_after_fork.vgtest trunk/gdbserver_tests/mchelp.vgtest trunk/gdbserver_tests/mcinfcallRU.vgtest trunk/gdbserver_tests/mcinfcallWSRU.vgtest trunk/gdbserver_tests/mcinvokeRU.vgtest trunk/gdbserver_tests/mcinvokeWS.vgtest trunk/gdbserver_tests/mcleak.vgtest trunk/gdbserver_tests/mcsignopass.vgtest trunk/gdbserver_tests/mcsigpass.vgtest trunk/gdbserver_tests/mcvabits.vgtest trunk/gdbserver_tests/mcwatchpoints.vgtest trunk/gdbserver_tests/mssnapshot.vgtest trunk/gdbserver_tests/nlcontrolc.vgtest Modified: trunk/gdbserver_tests/mcbreak.vgtest =================================================================== --- trunk/gdbserver_tests/mcbreak.vgtest 2011-05-15 05:44:59 UTC (rev 11751) +++ trunk/gdbserver_tests/mcbreak.vgtest 2011-05-15 06:07:57 UTC (rev 11752) @@ -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 Modified: trunk/gdbserver_tests/mcclean_after_fork.vgtest =================================================================== --- trunk/gdbserver_tests/mcclean_after_fork.vgtest 2011-05-15 05:44:59 UTC (rev 11751) +++ trunk/gdbserver_tests/mcclean_after_fork.vgtest 2011-05-15 06:07:57 UTC (rev 11752) @@ -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 Modified: trunk/gdbserver_tests/mchelp.vgtest =================================================================== --- trunk/gdbserver_tests/mchelp.vgtest 2011-05-15 05:44:59 UTC (rev 11751) +++ trunk/gdbserver_tests/mchelp.vgtest 2011-05-15 06:07:57 UTC (rev 11752) @@ -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 Modified: trunk/gdbserver_tests/mcinfcallRU.vgtest =================================================================== --- trunk/gdbserver_tests/mcinfcallRU.vgtest 2011-05-15 05:44:59 UTC (rev 11751) +++ trunk/gdbserver_tests/mcinfcallRU.vgtest 2011-05-15 06:07:57 UTC (rev 11752) @@ -9,7 +9,7 @@ # 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 Modified: trunk/gdbserver_tests/mcinfcallWSRU.vgtest =================================================================== --- trunk/gdbserver_tests/mcinfcallWSRU.vgtest 2011-05-15 05:44:59 UTC (rev 11751) +++ trunk/gdbserver_tests/mcinfcallWSRU.vgtest 2011-05-15 06:07:57 UTC (rev 11752) @@ -6,7 +6,7 @@ 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 Modified: trunk/gdbserver_tests/mcinvokeRU.vgtest =================================================================== --- trunk/gdbserver_tests/mcinvokeRU.vgtest 2011-05-15 05:44:59 UTC (rev 11751) +++ trunk/gdbserver_tests/mcinvokeRU.vgtest 2011-05-15 06:07:57 UTC (rev 11752) @@ -5,6 +5,7 @@ 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. Modified: trunk/gdbserver_tests/mcinvokeWS.vgtest =================================================================== --- trunk/gdbserver_tests/mcinvokeWS.vgtest 2011-05-15 05:44:59 UTC (rev 11751) +++ trunk/gdbserver_tests/mcinvokeWS.vgtest 2011-05-15 06:07:57 UTC (rev 11752) @@ -4,7 +4,7 @@ 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 Modified: trunk/gdbserver_tests/mcleak.vgtest =================================================================== --- trunk/gdbserver_tests/mcleak.vgtest 2011-05-15 05:44:59 UTC (rev 11751) +++ trunk/gdbserver_tests/mcleak.vgtest 2011-05-15 06:07:57 UTC (rev 11752) @@ -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 Modified: trunk/gdbserver_tests/mcsignopass.vgtest =================================================================== --- trunk/gdbserver_tests/mcsignopass.vgtest 2011-05-15 05:44:59 UTC (rev 11751) +++ trunk/gdbserver_tests/mcsignopass.vgtest 2011-05-15 06:07:57 UTC (rev 11752) @@ -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 Modified: trunk/gdbserver_tests/mcsigpass.vgtest =================================================================== --- trunk/gdbserver_tests/mcsigpass.vgtest 2011-05-15 05:44:59 UTC (rev 11751) +++ trunk/gdbserver_tests/mcsigpass.vgtest 2011-05-15 06:07:57 UTC (rev 11752) @@ -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 Modified: trunk/gdbserver_tests/mcvabits.vgtest =================================================================== --- trunk/gdbserver_tests/mcvabits.vgtest 2011-05-15 05:44:59 UTC (rev 11751) +++ trunk/gdbserver_tests/mcvabits.vgtest 2011-05-15 06:07:57 UTC (rev 11752) @@ -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 Modified: trunk/gdbserver_tests/mcwatchpoints.vgtest =================================================================== --- trunk/gdbserver_tests/mcwatchpoints.vgtest 2011-05-15 05:44:59 UTC (rev 11751) +++ trunk/gdbserver_tests/mcwatchpoints.vgtest 2011-05-15 06:07:57 UTC (rev 11752) @@ -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 Modified: trunk/gdbserver_tests/mssnapshot.vgtest =================================================================== --- trunk/gdbserver_tests/mssnapshot.vgtest 2011-05-15 05:44:59 UTC (rev 11751) +++ trunk/gdbserver_tests/mssnapshot.vgtest 2011-05-15 06:07:57 UTC (rev 11752) @@ -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 Modified: trunk/gdbserver_tests/nlcontrolc.vgtest =================================================================== --- trunk/gdbserver_tests/nlcontrolc.vgtest 2011-05-15 05:44:59 UTC (rev 11751) +++ trunk/gdbserver_tests/nlcontrolc.vgtest 2011-05-15 06:07:57 UTC (rev 11752) @@ -10,7 +10,7 @@ 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 |
|
From: Florian K. <br...@ac...> - 2011-05-15 12:26:43
|
On 05/15/2011 02:07 AM, sv...@va... wrote: > Author: bart > Date: 2011-05-15 07:07:57 +0100 (Sun, 15 May 2011) > New Revision: 11752 > > Log: > Skip gdbserver tests if ./configure did not find gdb. > Checking for the minimum required version 6.5 would be good, too. I had 6.3 on the s390x box and the tests were just hanging. Florian |
|
From: Bart V. A. <bva...@ac...> - 2011-05-15 15:35:35
|
On Sun, May 15, 2011 at 2:26 PM, Florian Krohm <br...@ac...> wrote: > > On 05/15/2011 02:07 AM, sv...@va... wrote: > > Author: bart > > Date: 2011-05-15 07:07:57 +0100 (Sun, 15 May 2011) > > New Revision: 11752 > > > > Log: > > Skip gdbserver tests if ./configure did not find gdb. > > > > Checking for the minimum required version 6.5 would be good, too. > I had 6.3 on the s390x box and the tests were just hanging. Hello Florian, Have you already had a look at gdbserver_tests/make_local_links ? There is already a test in that script that checks whether the gdb version is >= 6.5. Bart. |
|
From: Philippe W. <phi...@sk...> - 2011-05-15 16:29:12
|
>> Checking for the minimum required version 6.5 would be good, too. >> I had 6.3 on the s390x box and the tests were just hanging. > > Hello Florian, > > Have you already had a look at gdbserver_tests/make_local_links ? > There is already a test in that script that checks whether the gdb > version is >= 6.5. > > Bart. Hello Florian and Bart, The version check should now work thanks to the recent additions by Bart of the prereq that gdb link must be present in the gdbserver_tests directory. Bart, note that some gdbserver tests are testing vgdb standalone, and are not using gdb. For these tests, the prerequisite that gdb is available and has the good version is too strict. These tests are: mchelp, mcinvokeRU, mcinvokeWS. They (are supposed to) work even if no gdb is present. Philippe |
|
From: Bart V. A. <bva...@ac...> - 2011-05-15 16:47:54
|
On Sun, May 15, 2011 at 6:29 PM, Philippe Waroquiers < phi...@sk...> wrote: > > Bart, note that some gdbserver tests are testing vgdb standalone, > and are not using gdb. > For these tests, the prerequisite that gdb is available and has the good > version is too strict. > > These tests are: mchelp, mcinvokeRU, mcinvokeWS. > They (are supposed to) work even if no gdb is present. > Something like r11756 ? Bart. |
|
From: Florian K. <br...@ac...> - 2011-05-16 12:19:12
|
On 05/15/2011 12:29 PM, Philippe Waroquiers wrote:
>
>>> Checking for the minimum required version 6.5 would be good, too.
>>> I had 6.3 on the s390x box and the tests were just hanging.
>>
>> Hello Florian,
>>
>> Have you already had a look at gdbserver_tests/make_local_links ?
>> There is already a test in that script that checks whether the gdb
>> version is >= 6.5.
>>
>> Bart.
>
> Hello Florian and Bart,
>
> The version check should now work thanks to the recent additions by Bart
> of the prereq that gdb link must be present in the gdbserver_tests
> directory.
>
Yes, it's working properly now. I just retested with gdb 6.3.
Thanks for fixing.
Florian
|