Skip to contentSkip to conversation

valgrind: replace a submitted patch with one that was merged

PATCH New Alexander Kanavin 1 participant 4 messages Feb 22, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/4 valgrind: replace a submitted patch with one that was merged

This addresses a ptest failure in particular that the submitted patch caused.

---
 ...ad_detatch-call-portable-across-plat.patch | 65 +++++++++++++++----
 1 file changed, 54 insertions(+), 11 deletions(-)
meta/recipes-devtools/valgrind/valgrind/0001-tests-Make-pthread_detatch-call-portable-across-plat.patch +54 -11
index 44d707a235..f407d8191b 100644
@@ -1,25 +1,31 @@
-From 90fdb0ae0418f7907f09b763343a457bdf6855fa Mon Sep 17 00:00:00 2001
+From 92fcf75d6d3903e45492b041bf4ad07787d2e58a Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
-Date: Mon, 27 Jan 2020 17:17:19 -0800
-Subject: [PATCH] tests: Make pthread_detatch call portable across platforms
+Date: Mon, 27 Jan 2020 19:50:04 -0800
+Subject: [PATCH] drd/tests/pth_detached3: Make pthread_detach() call portable
+ across platforms
 
-pthread_t is opaque type therefore we can not apply simple arithmetic to variables of pthread_t type
-this test needs to pass a invalid pthread_t handle, typcasting to uintptr_t works too and is portable
-across glibc and musl
+pthread_t is opaque type therefore we can not apply simple arithmetic to
+variables of pthread_t type this test needs to pass a invalid pthread_t
+handle, typcasting to uintptr_t works too and is portable across glibc and
+musl
 
 Fixes
 | pth_detached3.c:24:25: error: invalid use of undefined type 'struct __pthread'
 |    24 |   pthread_detach(thread + 8);
 |       |                         ^
 
-Upstream-Status: Submitted [https://sourceforge.net/p/valgrind/mailman/message/36910506/]
+[ bvanassche: reformatted patch description and fixed up line numbers ]
+
+Upstream-Status: Backport [https://sourceware.org/git/?p=valgrind.git;a=commit;h=92fcf75d6d3903e45492b041bf4ad07787d2e58a]
 Signed-off-by: Khem Raj <[email protected]>
 ---
- drd/tests/pth_detached3.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
+ drd/tests/pth_detached3.c           | 3 ++-
+ drd/tests/pth_detached3.stderr.exp1 | 4 ++--
+ drd/tests/pth_detached3.stderr.exp2 | 4 ++--
+ 3 files changed, 6 insertions(+), 5 deletions(-)
 
 diff --git a/drd/tests/pth_detached3.c b/drd/tests/pth_detached3.c
-index c02eef11a..efeb15b72 100644
+index c02eef1..efeb15b 100644
 --- a/drd/tests/pth_detached3.c
 +++ b/drd/tests/pth_detached3.c
 @@ -4,6 +4,7 @@
@@ -39,6 +45,43 @@ index c02eef11a..efeb15b72 100644
  
    fprintf(stderr, "Finished.\n");
  
+diff --git a/drd/tests/pth_detached3.stderr.exp1 b/drd/tests/pth_detached3.stderr.exp1
+index 58412ec..8dd58ba 100644
+--- a/drd/tests/pth_detached3.stderr.exp1
++++ b/drd/tests/pth_detached3.stderr.exp1
+@@ -1,11 +1,11 @@
+ 
+ pthread_detach(): invalid thread ID 0x........
+    at 0x........: pthread_detach (drd_pthread_intercepts.c:?)
+-   by 0x........: main (pth_detached3.c:21)
++   by 0x........: main (pth_detached3.c:22)
+ 
+ pthread_detach(): invalid thread ID 0x........
+    at 0x........: pthread_detach (drd_pthread_intercepts.c:?)
+-   by 0x........: main (pth_detached3.c:24)
++   by 0x........: main (pth_detached3.c:25)
+ 
+ Finished.
+ 
+diff --git a/drd/tests/pth_detached3.stderr.exp2 b/drd/tests/pth_detached3.stderr.exp2
+index bdc5cf8..e82dee1 100644
+--- a/drd/tests/pth_detached3.stderr.exp2
++++ b/drd/tests/pth_detached3.stderr.exp2
+@@ -2,12 +2,12 @@
+ pthread_detach(): invalid thread ID 0x........
+    at 0x........: vgDrd_set_joinable (drd_pthread_intercepts.c:?)
+    by 0x........: pthread_detach (drd_pthread_intercepts.c:?)
+-   by 0x........: main (pth_detached3.c:21)
++   by 0x........: main (pth_detached3.c:22)
+ 
+ pthread_detach(): invalid thread ID 0x........
+    at 0x........: vgDrd_set_joinable (drd_pthread_intercepts.c:?)
+    by 0x........: pthread_detach (drd_pthread_intercepts.c:?)
+-   by 0x........: main (pth_detached3.c:24)
++   by 0x........: main (pth_detached3.c:25)
+ 
+ Finished.
+ 
 -- 
-2.25.0
+2.9.3
 
Signature · 1 line
2.25.0
#1 lore raw

PATCH 2/4 valgrind: exclude one more failing test for arm64

valgrind's test suite isn't generally run by upstream on arm64, so let's simply disable the failing test and establish a set that works.

---
 meta/recipes-devtools/valgrind/valgrind/remove-for-aarch64 | 1 +
 1 file changed, 1 insertion(+)
meta/recipes-devtools/valgrind/valgrind/remove-for-aarch64 +1 -0
index acf4fd1bc1..a3a0c6e50f 100644
@@ -1,3 +1,4 @@
+gdbserver_tests/hgtls
 cachegrind/tests/ann1
 callgrind/tests/simwork1
 callgrind/tests/simwork2
Signature · 1 line
2.25.0
#2 lore raw

PATCH 3/4 mdadm: fix more ptests

In reply to Alexander Kanavin

Particularly:
1. set $dir, so supplementary utilities can be found
2. disable integrity checks as they take more time than any other test

---
 meta/recipes-extended/mdadm/files/run-ptest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-extended/mdadm/files/run-ptest +1 -1
index 7959c055ad..fae8071d43 100644
@@ -2,6 +2,6 @@
 
 mkdir -p /mdadm-testing-dir
 # make the test continue to execute even one fail
-./test --keep-going
+dir=. ./test --keep-going --disable-integrity
 
 rm -rf /mdadm-testing-dir/*
Signature · 1 line
2.25.0
#3 lore raw

PATCH 4/4 mdadm: drop from PTESTS_SLOW

In reply to Alexander Kanavin

There are two primary reasons for this:

1. mdadm test suite tends to work like this

do_action
sleep arbitrary_amount
check_result

This is unreliable, and arbitrary_amount may or may not be enough. I have confirmed this by increasing the amount, and seeing more tests pass than before.

2. The test suite aborts half way through because one of the mdadm binaries segfaults. This indicates that upstream isn't actually running the suite anymore, and in this situation we shouldn't be relying on it either.

---
 meta/conf/distro/include/ptest-packagelists.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/conf/distro/include/ptest-packagelists.inc +1 -1
index 752a0882dc..6e770853b8 100644
@@ -58,6 +58,7 @@ PTESTS_FAST = "\
 #    rt-tests-ptest \ # Needs to be checked whether it runs at all
 #    bash-ptest \ # Test outcomes are non-deterministic by design
 #    ifupdown-ptest \ # Tested separately in lib/oeqa/selftest/cases/imagefeatures.py
+#    mdadm-ptest \ # Tests rely on non-deterministic sleep() amounts
 #"
 
 PTESTS_SLOW = "\
@@ -69,7 +70,6 @@ PTESTS_SLOW = "\
     gstreamer1.0-ptest \
     libevent-ptest \
     lttng-tools-ptest \
-    mdadm-ptest \
     openssh-ptest \
     openssl-ptest \
     perl-ptest \
Signature · 1 line
2.25.0