diff options
author | Randy MacLeod <Randy.MacLeod@windriver.com> | 2019-05-13 23:57:15 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-05-15 17:53:29 +0100 |
commit | 5ee06716de105456911419fb33031783c3cf8643 (patch) | |
tree | b8006fd25ca7354c60c38f562133680523515572 /meta/recipes-devtools/valgrind/valgrind/0001-valgrind-filter_xml_frames-do-not-filter-usr.patch | |
parent | ac087b259e78163863ca35bfe150ee297aa8ff5b (diff) | |
download | poky-5ee06716de105456911419fb33031783c3cf8643.tar.gz |
valgrind: adjust test filters and expected output
Skip two filters in filter_xml_frames since they
are intended to filter filesystem paths under '/usr' that
vary from platform to platform. In the ptest case
for Yocto's valgrind, the ptest executables are placed under:
/usr/lib/valgrind/ptest
and if these frames are filtered out, then several 'drd' tests fail
the comparision between expected and actual output.
Also adjust the std_list expected output to agree with that
produced when the --yocto-ptest option to vg_regtest is used.
(From OE-Core rev: 38cc663b69ec96ae1470f040f7dcb05e816deb2e)
Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/valgrind/valgrind/0001-valgrind-filter_xml_frames-do-not-filter-usr.patch')
-rw-r--r-- | meta/recipes-devtools/valgrind/valgrind/0001-valgrind-filter_xml_frames-do-not-filter-usr.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-valgrind-filter_xml_frames-do-not-filter-usr.patch b/meta/recipes-devtools/valgrind/valgrind/0001-valgrind-filter_xml_frames-do-not-filter-usr.patch new file mode 100644 index 0000000000..bf0f0ded21 --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/0001-valgrind-filter_xml_frames-do-not-filter-usr.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | From d1dea3c2bcf1e22baab39e2c0b8ca59db8a5bc37 Mon Sep 17 00:00:00 2001 | ||
2 | From: Randy MacLeod <Randy.MacLeod@windriver.com> | ||
3 | Date: Mon, 13 May 2019 17:12:21 -0400 | ||
4 | Subject: [PATCH 1/2] valgrind: filter_xml_frames: do not filter /usr | ||
5 | |||
6 | filter_xml_frames is intended to filter system paths under | ||
7 | '/usr' that vary from platform to platform. In the ptest case | ||
8 | for Yocto's valgrind, the ptest executables are placed under: | ||
9 | /usr/lib/valgrind/ptest | ||
10 | and if these frames are filtered out, then the 'drd' tests fail | ||
11 | the comparision between exepected and actual output. | ||
12 | |||
13 | Changing this filter allows the comparison to succeed without | ||
14 | any negative impact. | ||
15 | |||
16 | Upstream-Status: Inappropriate [Yocto specific] | ||
17 | |||
18 | Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> | ||
19 | --- | ||
20 | tests/filter_xml_frames | 3 ++- | ||
21 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
22 | |||
23 | diff --git a/tests/filter_xml_frames b/tests/filter_xml_frames | ||
24 | index f1fa3f070..04fbc82de 100755 | ||
25 | --- a/tests/filter_xml_frames | ||
26 | +++ b/tests/filter_xml_frames | ||
27 | @@ -47,7 +47,8 @@ while (my $line = <>) | ||
28 | $has_function_name = 1 if ($line =~ /<fn>/); | ||
29 | # This may require tweaking; currently /lib and /usr/lib are matched | ||
30 | $has_system_obj = 1 if ($line =~ /<obj>\/lib/); | ||
31 | - $has_system_obj = 1 if ($line =~ /<obj>\/usr\/lib/); | ||
32 | +# for Yocto, skip /usr since tests are under /usr/lib/... | ||
33 | +# $has_system_obj = 1 if ($line =~ /<obj>\/usr\/lib/); | ||
34 | } | ||
35 | } | ||
36 | |||
37 | -- | ||
38 | 2.17.0 | ||
39 | |||