Skip to contentSkip to conversation

fix valgrind ptest

PATCH In review Maxin B. John 2 participants 5 messages Mar 24, 2017

lore
Share & tools
lore

Maxin B. John

author
#0 lore raw

cover fix valgrind ptest

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(-)
Signature · 1 line
2.4.0
author
#1 lore raw

PATCH 1/2 vg_regtest.in : fix perl script

@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 <[email protected]>
---
 .../valgrind/valgrind/fixed-perl-path.patch        | 33 +++++++++++++++++++---
 1 file changed, 29 insertions(+), 4 deletions(-)
meta/recipes-devtools/valgrind/valgrind/fixed-perl-path.patch +29 -4
index b054d05..b431d33 100644
@@ -1,3 +1,8 @@
+From 67e7a690107efb16d6d5aebfe420b64a552accdf Mon Sep 17 00:00:00 2001
+From: Qing He <[email protected]>
+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 <[email protected]>
+---
+ 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
Signature · 1 line
2.4.0
author
#2 lore raw

PATCH 2/2 do_diffs: correct the comparison logic

In reply to Maxin B. John

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 <[email protected]>
---
 .../0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-devtools/valgrind/valgrind/0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch +2 -2
index f5ac989..7985308 100644
@@ -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($$)
Signature · 1 line
2.4.0
#3 lore raw
In reply to Maxin B. John
Quoted 4 lines · Maxin B. John

Maxin B. John (2):
vg_regtest.in : fix perl script
do_diffs: correct the comparison logic

Both patches missing the valgrind: prefix.

Ross

author
#4 lore raw

Hi Ross,

Will update and send it soon.

Regards,
Maxin

From: Burton, Ross [mailto:[email protected]]
Sent: Friday, March 24, 2017 4:54 PM
To: John, Maxin <[email protected]>
Cc: OE-core <[email protected]>
Subject: Re: [OE-core] [PATCH 0/2] fix valgrind ptest

On 24 March 2017 at 14:52, Maxin B. John <[email protected]<mailto:[email protected]>> 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