* [PATCH 0/2] fix valgrind ptest
@ 2017-03-24 14:52 Maxin B. John
2017-03-24 14:52 ` [PATCH 1/2] vg_regtest.in : fix perl script Maxin B. John
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Maxin B. John @ 2017-03-24 14:52 UTC (permalink / raw)
To: openembedded-core
Updated perl path in vg_regtest (test script)
Fixed the .exp and .out comparison logic
[YOCTO #8471]
Maxin B. John (2):
vg_regtest.in : fix perl script
do_diffs: correct the comparison logic
...-vg_test-wrapper-to-support-PTEST-formats.patch | 4 +--
.../valgrind/valgrind/fixed-perl-path.patch | 33 +++++++++++++++++++---
2 files changed, 31 insertions(+), 6 deletions(-)
--
2.4.0
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 1/2] vg_regtest.in : fix perl script 2017-03-24 14:52 [PATCH 0/2] fix valgrind ptest Maxin B. John @ 2017-03-24 14:52 ` Maxin B. John 2017-03-24 14:52 ` [PATCH 2/2] do_diffs: correct the comparison logic Maxin B. John 2017-03-24 14:54 ` [PATCH 0/2] fix valgrind ptest Burton, Ross 2 siblings, 0 replies; 6+ messages in thread From: Maxin B. John @ 2017-03-24 14:52 UTC (permalink / raw) To: openembedded-core @PERL@ in vg_regtest.in causes recipe specific sysroot based perl to be present in the vg_regtest script, making it unusable in the target. Use /usr/bin/perl instead of @PERL@ to fix it. Signed-off-by: Maxin B. John <maxin.john@intel.com> --- .../valgrind/valgrind/fixed-perl-path.patch | 33 +++++++++++++++++++--- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/meta/recipes-devtools/valgrind/valgrind/fixed-perl-path.patch b/meta/recipes-devtools/valgrind/valgrind/fixed-perl-path.patch index b054d05..b431d33 100644 --- a/meta/recipes-devtools/valgrind/valgrind/fixed-perl-path.patch +++ b/meta/recipes-devtools/valgrind/valgrind/fixed-perl-path.patch @@ -1,3 +1,8 @@ +From 67e7a690107efb16d6d5aebfe420b64a552accdf Mon Sep 17 00:00:00 2001 +From: Qing He <qing.he@intel.com> +Date: Tue, 31 Aug 2010 22:51:58 +0800 +Subject: [PATCH] valgrind: fix perl scripts + this is a temporary patch to workaround cross compilation. otherwise @PERL@ will be replaced to perl-native binary, this creates unusable scripts and fails FILERDEPENDS mechanism @@ -11,8 +16,16 @@ a better fix would need: Upstream-Status: Inappropriate [configuration] +Signed-off-by: Maxin B. John <maxin.john@intel.com> +--- + cachegrind/cg_annotate.in | 2 +- + cachegrind/cg_diff.in | 2 +- + massif/ms_print.in | 2 +- + perf/vg_perf.in | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + diff --git a/cachegrind/cg_annotate.in b/cachegrind/cg_annotate.in -index 9dc9565..cc4ef05 100644 +index 69365e8..978265d 100644 --- a/cachegrind/cg_annotate.in +++ b/cachegrind/cg_annotate.in @@ -1,4 +1,4 @@ @@ -22,7 +35,7 @@ index 9dc9565..cc4ef05 100644 ##--------------------------------------------------------------------## ##--- Cachegrind's annotator. cg_annotate.in ---## diff --git a/cachegrind/cg_diff.in b/cachegrind/cg_diff.in -index 951066e..84c2dde 100644 +index 395460b..05873cc 100755 --- a/cachegrind/cg_diff.in +++ b/cachegrind/cg_diff.in @@ -1,4 +1,4 @@ @@ -32,7 +45,7 @@ index 951066e..84c2dde 100644 ##--------------------------------------------------------------------## ##--- Cachegrind's differencer. cg_diff.in ---## diff --git a/massif/ms_print.in b/massif/ms_print.in -index e6ffdbf..fb45906 100755 +index e6fae89..3b85b40 100755 --- a/massif/ms_print.in +++ b/massif/ms_print.in @@ -1,4 +1,4 @@ @@ -42,7 +55,7 @@ index e6ffdbf..fb45906 100755 ##--------------------------------------------------------------------## ##--- Massif's results printer ms_print.in ---## diff --git a/perf/vg_perf.in b/perf/vg_perf.in -index 2188a31..83ad024 100644 +index 7a80cb0..28f6156 100644 --- a/perf/vg_perf.in +++ b/perf/vg_perf.in @@ -1,4 +1,4 @@ @@ -51,3 +64,15 @@ index 2188a31..83ad024 100644 ##--------------------------------------------------------------------## ##--- Valgrind performance testing script vg_perf ---## ##--------------------------------------------------------------------## +diff --git a/tests/vg_regtest.in b/tests/vg_regtest.in +index cb05b52..032e947 100755 +--- a/tests/vg_regtest.in ++++ b/tests/vg_regtest.in +@@ -1,4 +1,4 @@ +-#! @PERL@ ++#! /usr/bin/perl + ##--------------------------------------------------------------------## + ##--- Valgrind regression testing script vg_regtest ---## + ##--------------------------------------------------------------------## +--- +2.4.0 -- 2.4.0 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] do_diffs: correct the comparison logic 2017-03-24 14:52 [PATCH 0/2] fix valgrind ptest Maxin B. John 2017-03-24 14:52 ` [PATCH 1/2] vg_regtest.in : fix perl script Maxin B. John @ 2017-03-24 14:52 ` Maxin B. John 2017-03-24 14:54 ` [PATCH 0/2] fix valgrind ptest Burton, Ross 2 siblings, 0 replies; 6+ messages in thread From: Maxin B. John @ 2017-03-24 14:52 UTC (permalink / raw) To: openembedded-core do_diffs in the vg_regtest script compares the actual test output against the expected test output and returns 0 if it matches. Previous upgrade modified the return value of do_diffs() and that resulted in ptest failures. [YOCTO #8471] Signed-off-by: Maxin B. John <maxin.john@intel.com> --- .../0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/valgrind/valgrind/0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch b/meta/recipes-devtools/valgrind/valgrind/0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch index f5ac989..7985308 100644 --- a/meta/recipes-devtools/valgrind/valgrind/0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch +++ b/meta/recipes-devtools/valgrind/valgrind/0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch @@ -100,7 +100,7 @@ index a441f42..cb05b52 100755 unlink("$name.$mid.out"); unlink(<$name.$mid.diff*>); - return; -+ return 1; ++ return 0; } } } @@ -113,7 +113,7 @@ index a441f42..cb05b52 100755 print "Failure encountered, stopping to loop\n"; exit 1 } -+ return 0; ++ return 1; } sub do_one_test($$) -- 2.4.0 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 0/2] fix valgrind ptest 2017-03-24 14:52 [PATCH 0/2] fix valgrind ptest Maxin B. John 2017-03-24 14:52 ` [PATCH 1/2] vg_regtest.in : fix perl script Maxin B. John 2017-03-24 14:52 ` [PATCH 2/2] do_diffs: correct the comparison logic Maxin B. John @ 2017-03-24 14:54 ` Burton, Ross 2017-03-24 15:04 ` John, Maxin 2 siblings, 1 reply; 6+ messages in thread From: Burton, Ross @ 2017-03-24 14:54 UTC (permalink / raw) To: Maxin B. John; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 234 bytes --] On 24 March 2017 at 14:52, Maxin B. John <maxin.john@intel.com> wrote: > Maxin B. John (2): > vg_regtest.in : fix perl script > do_diffs: correct the comparison logic > Both patches missing the valgrind: prefix. Ross [-- Attachment #2: Type: text/html, Size: 710 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 0/2] fix valgrind ptest 2017-03-24 14:54 ` [PATCH 0/2] fix valgrind ptest Burton, Ross @ 2017-03-24 15:04 ` John, Maxin 0 siblings, 0 replies; 6+ messages in thread From: John, Maxin @ 2017-03-24 15:04 UTC (permalink / raw) To: Burton, Ross; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 582 bytes --] Hi Ross, Will update and send it soon. Regards, Maxin From: Burton, Ross [mailto:ross.burton@intel.com] Sent: Friday, March 24, 2017 4:54 PM To: John, Maxin <maxin.john@intel.com> Cc: OE-core <openembedded-core@lists.openembedded.org> Subject: Re: [OE-core] [PATCH 0/2] fix valgrind ptest On 24 March 2017 at 14:52, Maxin B. John <maxin.john@intel.com<mailto:maxin.john@intel.com>> wrote: Maxin B. John (2): vg_regtest.in<http://vg_regtest.in> : fix perl script do_diffs: correct the comparison logic Both patches missing the valgrind: prefix. Ross [-- Attachment #2: Type: text/html, Size: 4015 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 0/2] fix valgrind ptest @ 2017-03-24 15:03 Maxin B. John 0 siblings, 0 replies; 6+ messages in thread From: Maxin B. John @ 2017-03-24 15:03 UTC (permalink / raw) To: openembedded-core Updated perl path in vg_regtest (test script) Fixed the .exp and .out comparison logic [YOCTO #8471] Maxin B. John (2): valgrind: vg_regtest.in: fix perl script valgrind: correct the comparison logic in vg_regtest ...-vg_test-wrapper-to-support-PTEST-formats.patch | 4 +-- .../valgrind/valgrind/fixed-perl-path.patch | 33 +++++++++++++++++++--- 2 files changed, 31 insertions(+), 6 deletions(-) -- 2.4.0 ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-03-24 15:04 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2017-03-24 14:52 [PATCH 0/2] fix valgrind ptest Maxin B. John 2017-03-24 14:52 ` [PATCH 1/2] vg_regtest.in : fix perl script Maxin B. John 2017-03-24 14:52 ` [PATCH 2/2] do_diffs: correct the comparison logic Maxin B. John 2017-03-24 14:54 ` [PATCH 0/2] fix valgrind ptest Burton, Ross 2017-03-24 15:04 ` John, Maxin -- strict thread matches above, loose matches on Subject: below -- 2017-03-24 15:03 Maxin B. John
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox