diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2023-05-22 19:25:03 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-05-25 10:29:09 +0100 |
commit | f18e1d2c6a13c3bd8c130f0d20ff2b62a137d84a (patch) | |
tree | 73090de53f6d038e6ce96c85ed8a716d1386ff38 /meta/recipes-devtools/valgrind | |
parent | c103a1511173935b8e1b7745829b83a00dd110f7 (diff) | |
download | poky-f18e1d2c6a13c3bd8c130f0d20ff2b62a137d84a.tar.gz |
valgrind: update 3.20.0 -> 3.21.0
Drop patches merged upstream.
(From OE-Core rev: 3c4d78d8a1d5eca91bee66fd815c80eb0889ce81)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/valgrind')
8 files changed, 65 insertions, 235 deletions
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-drd-tests-Include-missing-cstdint.patch b/meta/recipes-devtools/valgrind/valgrind/0001-drd-tests-Include-missing-cstdint.patch deleted file mode 100644 index fbee24a538..0000000000 --- a/meta/recipes-devtools/valgrind/valgrind/0001-drd-tests-Include-missing-cstdint.patch +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | From 687d9fb9e3de832379680e9d5268331011c92afa Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 26 Jan 2023 08:53:26 -0800 | ||
4 | Subject: [PATCH] drd/tests: Include missing <cstdint> | ||
5 | |||
6 | gcc 13 moved some includes around and as a result <cstdint> is no longer | ||
7 | transitively included [1]. Explicitly include it for uint{32,64}_t. | ||
8 | |||
9 | Fixes | ||
10 | tsan_thread_wrappers_pthread.h:91:9: error: 'int64_t' does not name a type | ||
11 | |||
12 | [1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes | ||
13 | |||
14 | Upstream-Status: Submitted [https://bugs.kde.org/show_bug.cgi?id=464859] | ||
15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
16 | --- | ||
17 | drd/tests/tsan_thread_wrappers_pthread.h | 1 + | ||
18 | 1 file changed, 1 insertion(+) | ||
19 | |||
20 | diff --git a/drd/tests/tsan_thread_wrappers_pthread.h b/drd/tests/tsan_thread_wrappers_pthread.h | ||
21 | index f15e6ad..4cc8062 100644 | ||
22 | --- a/drd/tests/tsan_thread_wrappers_pthread.h | ||
23 | +++ b/drd/tests/tsan_thread_wrappers_pthread.h | ||
24 | @@ -55,6 +55,7 @@ | ||
25 | #define NO_TLS | ||
26 | #endif | ||
27 | |||
28 | +#include <cstdint> | ||
29 | #include <string> | ||
30 | using namespace std; | ||
31 | |||
32 | -- | ||
33 | 2.39.1 | ||
34 | |||
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-memcheck-arm64-Define-__THROW-if-not-already-defined.patch b/meta/recipes-devtools/valgrind/valgrind/0001-memcheck-arm64-Define-__THROW-if-not-already-defined.patch deleted file mode 100644 index a48d7db070..0000000000 --- a/meta/recipes-devtools/valgrind/valgrind/0001-memcheck-arm64-Define-__THROW-if-not-already-defined.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | From 3409dc35c15bb14c8a525239806322648e079ab1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 5 Jul 2017 17:12:43 -0700 | ||
4 | Subject: [PATCH 1/3] memcheck/arm64: Define __THROW if not already defined | ||
5 | |||
6 | Helps compiling with musl where __THROW is not available | ||
7 | |||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | --- | ||
10 | Upstream-Status: Submitted | ||
11 | |||
12 | memcheck/tests/arm64-linux/scalar.h | 4 ++++ | ||
13 | 1 file changed, 4 insertions(+) | ||
14 | |||
15 | diff --git a/memcheck/tests/arm64-linux/scalar.h b/memcheck/tests/arm64-linux/scalar.h | ||
16 | index 9008816..8ef050f 100644 | ||
17 | --- a/memcheck/tests/arm64-linux/scalar.h | ||
18 | +++ b/memcheck/tests/arm64-linux/scalar.h | ||
19 | @@ -12,6 +12,10 @@ | ||
20 | #include <sys/types.h> | ||
21 | #include <sys/mman.h> | ||
22 | |||
23 | +#ifndef __THROW | ||
24 | +#define __THROW | ||
25 | +#endif | ||
26 | + | ||
27 | // Since we use vki_unistd.h, we can't include <unistd.h>. So we have to | ||
28 | // declare this ourselves. | ||
29 | extern long int syscall (long int __sysno, ...) __THROW; | ||
30 | -- | ||
31 | 2.13.2 | ||
32 | |||
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-none-tests-x86-linux-seg_override.c-add-missing-incl.patch b/meta/recipes-devtools/valgrind/valgrind/0001-none-tests-x86-linux-seg_override.c-add-missing-incl.patch new file mode 100644 index 0000000000..5e36c28523 --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/0001-none-tests-x86-linux-seg_override.c-add-missing-incl.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | From 978d9ed7f857f2cdcd2a8632f3c2feb56b99c825 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex@linutronix.de> | ||
3 | Date: Mon, 8 May 2023 11:56:35 +0200 | ||
4 | Subject: [PATCH] none/tests/x86-linux/seg_override.c: add missing include for | ||
5 | musl builds | ||
6 | |||
7 | Otherwise SYS_modify_ldt is undefined. | ||
8 | |||
9 | Upstream-Status: Submitted [https://bugs.kde.org/show_bug.cgi?id=382034] | ||
10 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
11 | |||
12 | --- | ||
13 | none/tests/x86-linux/seg_override.c | 4 ++++ | ||
14 | 1 file changed, 4 insertions(+) | ||
15 | |||
16 | diff --git a/none/tests/x86-linux/seg_override.c b/none/tests/x86-linux/seg_override.c | ||
17 | index ca8fbfe..4ef4394 100644 | ||
18 | --- a/none/tests/x86-linux/seg_override.c | ||
19 | +++ b/none/tests/x86-linux/seg_override.c | ||
20 | @@ -3,6 +3,10 @@ | ||
21 | #include <errno.h> | ||
22 | #include <string.h> | ||
23 | #include "../../../config.h" | ||
24 | +#if defined(MUSL_LIBC) | ||
25 | +#include <syscall.h> | ||
26 | +#include <unistd.h> | ||
27 | +#endif | ||
28 | |||
29 | |||
30 | /* Stuff from Wine. */ | ||
diff --git a/meta/recipes-devtools/valgrind/valgrind/0002-memcheck-x86-Define-__THROW-if-not-defined.patch b/meta/recipes-devtools/valgrind/valgrind/0002-memcheck-x86-Define-__THROW-if-not-defined.patch deleted file mode 100644 index 5433472291..0000000000 --- a/meta/recipes-devtools/valgrind/valgrind/0002-memcheck-x86-Define-__THROW-if-not-defined.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | From 67d199dbdcbb3feff5f8928f87725fc64c0307d7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 5 Jul 2017 17:36:42 -0700 | ||
4 | Subject: [PATCH 2/3] memcheck/x86: Define __THROW if not defined | ||
5 | |||
6 | musl does not have __THROW, therefore make it null | ||
7 | |||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | --- | ||
10 | Upstream-Status: Submitted | ||
11 | |||
12 | memcheck/tests/x86-linux/scalar.h | 4 ++++ | ||
13 | 1 file changed, 4 insertions(+) | ||
14 | |||
15 | diff --git a/memcheck/tests/x86-linux/scalar.h b/memcheck/tests/x86-linux/scalar.h | ||
16 | index ef28b03..52f742e 100644 | ||
17 | --- a/memcheck/tests/x86-linux/scalar.h | ||
18 | +++ b/memcheck/tests/x86-linux/scalar.h | ||
19 | @@ -11,6 +11,10 @@ | ||
20 | #include <sys/types.h> | ||
21 | #include <sys/mman.h> | ||
22 | |||
23 | +#ifndef __THROW | ||
24 | +#define __THROW | ||
25 | +#endif | ||
26 | + | ||
27 | // Since we use vki_unistd.h, we can't include <unistd.h>. So we have to | ||
28 | // declare this ourselves. | ||
29 | extern long int syscall (long int __sysno, ...) __THROW; | ||
30 | -- | ||
31 | 2.13.2 | ||
32 | |||
diff --git a/meta/recipes-devtools/valgrind/valgrind/0003-tests-seg_override-Replace-__modify_ldt-with-syscall.patch b/meta/recipes-devtools/valgrind/valgrind/0003-tests-seg_override-Replace-__modify_ldt-with-syscall.patch deleted file mode 100644 index fa1344c853..0000000000 --- a/meta/recipes-devtools/valgrind/valgrind/0003-tests-seg_override-Replace-__modify_ldt-with-syscall.patch +++ /dev/null | |||
@@ -1,68 +0,0 @@ | |||
1 | From d103475875858ab8a2e6b53ce178bb2f63883d4c Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 5 Jul 2017 17:37:56 -0700 | ||
4 | Subject: [PATCH 3/3] tests/seg_override: Replace __modify_ldt() with syscall() | ||
5 | |||
6 | __modify_ldt() is specific to glibc, replacing it with syscall() | ||
7 | makes it more portable. | ||
8 | |||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | Upstream-Status: Submitted | ||
12 | |||
13 | none/tests/x86-linux/seg_override.c | 15 ++++++--------- | ||
14 | 1 file changed, 6 insertions(+), 9 deletions(-) | ||
15 | |||
16 | diff --git a/none/tests/x86-linux/seg_override.c b/none/tests/x86-linux/seg_override.c | ||
17 | index b7619c9..c89874b 100644 | ||
18 | --- a/none/tests/x86-linux/seg_override.c | ||
19 | +++ b/none/tests/x86-linux/seg_override.c | ||
20 | @@ -2,6 +2,8 @@ | ||
21 | #include <stdio.h> | ||
22 | #include <errno.h> | ||
23 | #include <string.h> | ||
24 | +#include <unistd.h> | ||
25 | +#include <syscall.h> | ||
26 | |||
27 | /* Stuff from Wine. */ | ||
28 | |||
29 | @@ -52,14 +54,11 @@ inline static unsigned int wine_ldt_get_limit( const LDT_ENTRY *ent ) | ||
30 | /* our copy of the ldt */ | ||
31 | LDT_ENTRY ldt_copy[8192]; | ||
32 | |||
33 | -/* System call to set LDT entry. */ | ||
34 | -//extern int __modify_ldt (int, struct modify_ldt_ldt_s *, size_t); | ||
35 | -extern int __modify_ldt (int, void *, size_t); | ||
36 | - | ||
37 | void print_ldt ( void ) | ||
38 | { | ||
39 | int res; | ||
40 | - res = __modify_ldt( 0, ldt_copy, 8192*sizeof(LDT_ENTRY) ); | ||
41 | + /* System call to set LDT entry. */ | ||
42 | + res = syscall(SYS_modify_ldt, 0, ldt_copy, 8192*sizeof(LDT_ENTRY) ); | ||
43 | printf("got %d bytes\n", res ); | ||
44 | perror("error is"); | ||
45 | } | ||
46 | @@ -83,9 +82,6 @@ struct modify_ldt_ldt_s | ||
47 | unsigned int empty:25; | ||
48 | }; | ||
49 | |||
50 | -/* System call to set LDT entry. */ | ||
51 | -//extern int __modify_ldt (int, struct modify_ldt_ldt_s *, size_t); | ||
52 | - | ||
53 | void set_ldt1 ( void* base ) | ||
54 | { | ||
55 | int stat; | ||
56 | @@ -102,7 +98,8 @@ void set_ldt1 ( void* base ) | ||
57 | ldt_entry.read_exec_only = 0; | ||
58 | ldt_entry.limit_in_pages = 0; | ||
59 | ldt_entry.seg_not_present = 0; | ||
60 | - stat = __modify_ldt (1, &ldt_entry, sizeof (ldt_entry)); | ||
61 | + /* System call to set LDT entry. */ | ||
62 | + stat = syscall(SYS_modify_ldt, 1, &ldt_entry, sizeof (ldt_entry)); | ||
63 | printf("stat = %d\n", stat); | ||
64 | } | ||
65 | |||
66 | -- | ||
67 | 2.13.2 | ||
68 | |||
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 a3637ea846..fea3b00f62 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 | |||
@@ -1,7 +1,7 @@ | |||
1 | From f49f27f1bc67d07440b0ac9a7d767a8ea1589bfe Mon Sep 17 00:00:00 2001 | 1 | From e244a72c6f8803550f37e81f72bbae039651013b Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Tue, 15 Dec 2015 15:50:44 +0200 | 3 | Date: Tue, 15 Dec 2015 15:50:44 +0200 |
4 | Subject: [PATCH 5/5] Modify vg_test wrapper to support PTEST formats | 4 | Subject: [PATCH] Modify vg_test wrapper to support PTEST formats |
5 | 5 | ||
6 | Change the valgrind regression test script vg_regtest to | 6 | Change the valgrind regression test script vg_regtest to |
7 | support the yocto ptest stdout reporting format. The commit adds | 7 | support the yocto ptest stdout reporting format. The commit adds |
@@ -25,11 +25,11 @@ Increase time limit to 90 s. | |||
25 | 25 | ||
26 | Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> | 26 | Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> |
27 | --- | 27 | --- |
28 | tests/vg_regtest.in | 75 +++++++++++++++++++++++++++++++++++++++-------------- | 28 | tests/vg_regtest.in | 75 +++++++++++++++++++++++++++++++++------------ |
29 | 1 file changed, 55 insertions(+), 20 deletions(-) | 29 | 1 file changed, 55 insertions(+), 20 deletions(-) |
30 | 30 | ||
31 | diff --git a/tests/vg_regtest.in b/tests/vg_regtest.in | 31 | diff --git a/tests/vg_regtest.in b/tests/vg_regtest.in |
32 | index a441f42..cb05b52 100755 | 32 | index ad18800..e4bd8cb 100755 |
33 | --- a/tests/vg_regtest.in | 33 | --- a/tests/vg_regtest.in |
34 | +++ b/tests/vg_regtest.in | 34 | +++ b/tests/vg_regtest.in |
35 | @@ -47,6 +47,7 @@ | 35 | @@ -47,6 +47,7 @@ |
@@ -49,7 +49,7 @@ index a441f42..cb05b52 100755 | |||
49 | . " Use EXTRA_REGTEST_OPTS to supply extra args for all tests\n" | 49 | . " Use EXTRA_REGTEST_OPTS to supply extra args for all tests\n" |
50 | . "\n"; | 50 | . "\n"; |
51 | 51 | ||
52 | @@ -186,6 +187,7 @@ my $outer_args; | 52 | @@ -187,6 +188,7 @@ my $run_outer_args = ""; |
53 | my $valgrind_lib = "$tests_dir/.in_place"; | 53 | my $valgrind_lib = "$tests_dir/.in_place"; |
54 | my $keepunfiltered = 0; | 54 | my $keepunfiltered = 0; |
55 | my $looptillfail = 0; | 55 | my $looptillfail = 0; |
@@ -57,7 +57,7 @@ index a441f42..cb05b52 100755 | |||
57 | 57 | ||
58 | # default filter is the one named "filter_stderr" in the test's directory | 58 | # default filter is the one named "filter_stderr" in the test's directory |
59 | my $default_stderr_filter = "filter_stderr"; | 59 | my $default_stderr_filter = "filter_stderr"; |
60 | @@ -244,6 +246,8 @@ sub process_command_line() | 60 | @@ -245,6 +247,8 @@ sub process_command_line() |
61 | $keepunfiltered = 1; | 61 | $keepunfiltered = 1; |
62 | } elsif ($arg =~ /^--loop-till-fail$/) { | 62 | } elsif ($arg =~ /^--loop-till-fail$/) { |
63 | $looptillfail = 1; | 63 | $looptillfail = 1; |
@@ -66,7 +66,7 @@ index a441f42..cb05b52 100755 | |||
66 | } else { | 66 | } else { |
67 | die $usage; | 67 | die $usage; |
68 | } | 68 | } |
69 | @@ -365,13 +369,28 @@ sub read_vgtest_file($) | 69 | @@ -376,13 +380,28 @@ sub read_vgtest_file($) |
70 | #---------------------------------------------------------------------------- | 70 | #---------------------------------------------------------------------------- |
71 | # Since most of the program time is spent in system() calls, need this to | 71 | # Since most of the program time is spent in system() calls, need this to |
72 | # propagate a Ctrl-C enabling us to quit. | 72 | # propagate a Ctrl-C enabling us to quit. |
@@ -100,7 +100,7 @@ index a441f42..cb05b52 100755 | |||
100 | # if $keepunfiltered, copies $1 to $1.unfiltered.out | 100 | # if $keepunfiltered, copies $1 to $1.unfiltered.out |
101 | # renames $0 tp $1 | 101 | # renames $0 tp $1 |
102 | sub filtered_rename($$) | 102 | sub filtered_rename($$) |
103 | @@ -419,23 +438,25 @@ sub do_diffs($$$$) | 103 | @@ -430,23 +449,25 @@ sub do_diffs($$$$) |
104 | # A match; remove .out and any previously created .diff files. | 104 | # A match; remove .out and any previously created .diff files. |
105 | unlink("$name.$mid.out"); | 105 | unlink("$name.$mid.out"); |
106 | unlink(<$name.$mid.diff*>); | 106 | unlink(<$name.$mid.diff*>); |
@@ -128,7 +128,7 @@ index a441f42..cb05b52 100755 | |||
128 | $vgtest =~ /^(.*)\.vgtest/; | 128 | $vgtest =~ /^(.*)\.vgtest/; |
129 | my $name = $1; | 129 | my $name = $1; |
130 | my $fullname = "$dir/$name"; | 130 | my $fullname = "$dir/$name"; |
131 | @@ -454,7 +475,11 @@ sub do_one_test($$) | 131 | @@ -465,7 +486,11 @@ sub do_one_test($$) |
132 | } elsif (256 == $prereq_res) { | 132 | } elsif (256 == $prereq_res) { |
133 | # Nb: weird Perl-ism -- exit code of '1' is seen by Perl as 256... | 133 | # Nb: weird Perl-ism -- exit code of '1' is seen by Perl as 256... |
134 | # Prereq failed, skip. | 134 | # Prereq failed, skip. |
@@ -141,7 +141,7 @@ index a441f42..cb05b52 100755 | |||
141 | return; | 141 | return; |
142 | } else { | 142 | } else { |
143 | # Bad prereq; abort. | 143 | # Bad prereq; abort. |
144 | @@ -472,7 +497,7 @@ sub do_one_test($$) | 144 | @@ -483,7 +508,7 @@ sub do_one_test($$) |
145 | } | 145 | } |
146 | # If there is a progB, let's start it in background: | 146 | # If there is a progB, let's start it in background: |
147 | printf("%-16s valgrind $extraopts $vgopts $prog $args (progB: $progB $argsB)\n", | 147 | printf("%-16s valgrind $extraopts $vgopts $prog $args (progB: $progB $argsB)\n", |
@@ -150,7 +150,7 @@ index a441f42..cb05b52 100755 | |||
150 | # progB.done used to detect child has finished. See below. | 150 | # progB.done used to detect child has finished. See below. |
151 | # Note: redirection of stdout and stderr is before $progB to allow argsB | 151 | # Note: redirection of stdout and stderr is before $progB to allow argsB |
152 | # to e.g. redirect stdoutB to stderrB | 152 | # to e.g. redirect stdoutB to stderrB |
153 | @@ -488,7 +513,8 @@ sub do_one_test($$) | 153 | @@ -499,7 +524,8 @@ sub do_one_test($$) |
154 | . "touch progB.done) &"); | 154 | . "touch progB.done) &"); |
155 | } | 155 | } |
156 | } else { | 156 | } else { |
@@ -160,7 +160,7 @@ index a441f42..cb05b52 100755 | |||
160 | } | 160 | } |
161 | 161 | ||
162 | # Collect environment variables, if any. | 162 | # Collect environment variables, if any. |
163 | @@ -529,7 +555,7 @@ sub do_one_test($$) | 163 | @@ -540,7 +566,7 @@ sub do_one_test($$) |
164 | # Find all the .stdout.exp files. If none, use /dev/null. | 164 | # Find all the .stdout.exp files. If none, use /dev/null. |
165 | my @stdout_exps = <$name.stdout.exp*>; | 165 | my @stdout_exps = <$name.stdout.exp*>; |
166 | @stdout_exps = ( "/dev/null" ) if (0 == scalar @stdout_exps); | 166 | @stdout_exps = ( "/dev/null" ) if (0 == scalar @stdout_exps); |
@@ -169,7 +169,7 @@ index a441f42..cb05b52 100755 | |||
169 | 169 | ||
170 | # Filter stderr | 170 | # Filter stderr |
171 | $stderr_filter_args = $name if (! defined $stderr_filter_args); | 171 | $stderr_filter_args = $name if (! defined $stderr_filter_args); |
172 | @@ -538,7 +564,7 @@ sub do_one_test($$) | 172 | @@ -549,7 +575,7 @@ sub do_one_test($$) |
173 | # Find all the .stderr.exp files. At least one must exist. | 173 | # Find all the .stderr.exp files. At least one must exist. |
174 | my @stderr_exps = <$name.stderr.exp*>; | 174 | my @stderr_exps = <$name.stderr.exp*>; |
175 | (0 != scalar @stderr_exps) or die "Could not find `$name.stderr.exp*'\n"; | 175 | (0 != scalar @stderr_exps) or die "Could not find `$name.stderr.exp*'\n"; |
@@ -178,7 +178,7 @@ index a441f42..cb05b52 100755 | |||
178 | 178 | ||
179 | if (defined $progB) { | 179 | if (defined $progB) { |
180 | # wait for the child to be finished | 180 | # wait for the child to be finished |
181 | @@ -562,7 +588,7 @@ sub do_one_test($$) | 181 | @@ -573,7 +599,7 @@ sub do_one_test($$) |
182 | # Find all the .stdoutB.exp files. If none, use /dev/null. | 182 | # Find all the .stdoutB.exp files. If none, use /dev/null. |
183 | my @stdoutB_exps = <$name.stdoutB.exp*>; | 183 | my @stdoutB_exps = <$name.stdoutB.exp*>; |
184 | @stdoutB_exps = ( "/dev/null" ) if (0 == scalar @stdoutB_exps); | 184 | @stdoutB_exps = ( "/dev/null" ) if (0 == scalar @stdoutB_exps); |
@@ -187,7 +187,7 @@ index a441f42..cb05b52 100755 | |||
187 | 187 | ||
188 | # Filter stderr | 188 | # Filter stderr |
189 | $stderrB_filter_args = $name if (! defined $stderrB_filter_args); | 189 | $stderrB_filter_args = $name if (! defined $stderrB_filter_args); |
190 | @@ -571,7 +597,7 @@ sub do_one_test($$) | 190 | @@ -582,7 +608,7 @@ sub do_one_test($$) |
191 | # Find all the .stderrB.exp files. At least one must exist. | 191 | # Find all the .stderrB.exp files. At least one must exist. |
192 | my @stderrB_exps = <$name.stderrB.exp*>; | 192 | my @stderrB_exps = <$name.stderrB.exp*>; |
193 | (0 != scalar @stderrB_exps) or die "Could not find `$name.stderrB.exp*'\n"; | 193 | (0 != scalar @stderrB_exps) or die "Could not find `$name.stderrB.exp*'\n"; |
@@ -196,7 +196,7 @@ index a441f42..cb05b52 100755 | |||
196 | } | 196 | } |
197 | 197 | ||
198 | # Maybe do post-test check | 198 | # Maybe do post-test check |
199 | @@ -583,7 +609,7 @@ sub do_one_test($$) | 199 | @@ -594,7 +620,7 @@ sub do_one_test($$) |
200 | # Find all the .post.exp files. If none, use /dev/null. | 200 | # Find all the .post.exp files. If none, use /dev/null. |
201 | my @post_exps = <$name.post.exp*>; | 201 | my @post_exps = <$name.post.exp*>; |
202 | @post_exps = ( "/dev/null" ) if (0 == scalar @post_exps); | 202 | @post_exps = ( "/dev/null" ) if (0 == scalar @post_exps); |
@@ -205,7 +205,7 @@ index a441f42..cb05b52 100755 | |||
205 | } | 205 | } |
206 | } | 206 | } |
207 | 207 | ||
208 | @@ -592,6 +618,13 @@ sub do_one_test($$) | 208 | @@ -603,6 +629,13 @@ sub do_one_test($$) |
209 | print("(cleanup operation failed: $cleanup)\n"); | 209 | print("(cleanup operation failed: $cleanup)\n"); |
210 | } | 210 | } |
211 | 211 | ||
@@ -219,25 +219,25 @@ index a441f42..cb05b52 100755 | |||
219 | $num_tests_done++; | 219 | $num_tests_done++; |
220 | } | 220 | } |
221 | 221 | ||
222 | @@ -631,7 +664,7 @@ sub test_one_dir($$) | 222 | @@ -643,7 +676,7 @@ sub test_one_dir($$) |
223 | my $found_tests = (0 != (grep { $_ =~ /\.vgtest$/ } @fs)); | ||
224 | 223 | ||
224 | my $tests_start_time = time; | ||
225 | if ($found_tests) { | 225 | if ($found_tests) { |
226 | - print "-- Running tests in $full_dir $dashes\n"; | 226 | - print "-- Running tests in $full_dir $dashes\n"; |
227 | + print "-- Running tests in $full_dir $dashes\n" if ($yoctoptest == 0); | 227 | + print "-- Running tests in $full_dir $dashes\n" if ($yoctoptest == 0); |
228 | } | 228 | } |
229 | foreach my $f (@fs) { | 229 | foreach my $f (@fs) { |
230 | if (-d $f) { | 230 | if (-d $f) { |
231 | @@ -641,7 +674,7 @@ sub test_one_dir($$) | 231 | @@ -657,7 +690,7 @@ sub test_one_dir($$) |
232 | } | 232 | my $end_time = "(in $tests_cost_time sec)"; |
233 | } | 233 | my $end_dashes = "-" x (50 - (length $full_dir) |
234 | if ($found_tests) { | 234 | - (length $end_time) - 1); |
235 | - print "-- Finished tests in $full_dir $dashes\n"; | 235 | - print "-- Finished tests in $full_dir $end_time $end_dashes\n"; |
236 | + print "-- Finished tests in $full_dir $dashes\n" if ($yoctoptest == 0); | 236 | + print "-- Finished tests in $full_dir $dashes\n" if ($yoctoptest == 0); |
237 | } | 237 | } |
238 | 238 | ||
239 | chdir(".."); | 239 | chdir(".."); |
240 | @@ -667,10 +700,12 @@ sub summarise_results | 240 | @@ -683,10 +716,12 @@ sub summarise_results |
241 | $num_failures{"stdout"}, plural($num_failures{"stdout"}), | 241 | $num_failures{"stdout"}, plural($num_failures{"stdout"}), |
242 | $num_failures{"stderrB"}, plural($num_failures{"stderrB"}), | 242 | $num_failures{"stderrB"}, plural($num_failures{"stderrB"}), |
243 | $num_failures{"stdoutB"}, plural($num_failures{"stdoutB"}), | 243 | $num_failures{"stdoutB"}, plural($num_failures{"stdoutB"}), |
@@ -253,5 +253,5 @@ index a441f42..cb05b52 100755 | |||
253 | print "\n"; | 253 | print "\n"; |
254 | } | 254 | } |
255 | -- | 255 | -- |
256 | 2.6.2 | 256 | 2.30.2 |
257 | 257 | ||
diff --git a/meta/recipes-devtools/valgrind/valgrind/fixed-perl-path.patch b/meta/recipes-devtools/valgrind/valgrind/fixed-perl-path.patch index db6867f625..b9804e7451 100644 --- a/meta/recipes-devtools/valgrind/valgrind/fixed-perl-path.patch +++ b/meta/recipes-devtools/valgrind/valgrind/fixed-perl-path.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From d85cc45e0ddeda68adf594dead715964cb32d0e7 Mon Sep 17 00:00:00 2001 | 1 | From beaa5b64c60d501fa9cd59fdc563e5f5bccf6882 Mon Sep 17 00:00:00 2001 |
2 | From: Qing He <qing.he@intel.com> | 2 | From: Qing He <qing.he@intel.com> |
3 | Date: Tue, 31 Aug 2010 22:51:58 +0800 | 3 | Date: Tue, 31 Aug 2010 22:51:58 +0800 |
4 | Subject: [PATCH] valgrind: fix perl scripts | 4 | Subject: [PATCH] valgrind: fix perl scripts |
@@ -17,34 +17,13 @@ a better fix would need: | |||
17 | Upstream-Status: Inappropriate [configuration] | 17 | Upstream-Status: Inappropriate [configuration] |
18 | 18 | ||
19 | Signed-off-by: Maxin B. John <maxin.john@intel.com> | 19 | Signed-off-by: Maxin B. John <maxin.john@intel.com> |
20 | |||
20 | --- | 21 | --- |
21 | cachegrind/cg_annotate.in | 2 +- | 22 | massif/ms_print.in | 2 +- |
22 | cachegrind/cg_diff.in | 2 +- | 23 | perf/vg_perf.in | 2 +- |
23 | massif/ms_print.in | 2 +- | 24 | tests/vg_regtest.in | 2 +- |
24 | perf/vg_perf.in | 2 +- | 25 | 3 files changed, 3 insertions(+), 3 deletions(-) |
25 | tests/vg_regtest.in | 2 +- | ||
26 | 5 files changed, 5 insertions(+), 5 deletions(-) | ||
27 | 26 | ||
28 | diff --git a/cachegrind/cg_annotate.in b/cachegrind/cg_annotate.in | ||
29 | index fea114b..5e814fd 100644 | ||
30 | --- a/cachegrind/cg_annotate.in | ||
31 | +++ b/cachegrind/cg_annotate.in | ||
32 | @@ -1,4 +1,4 @@ | ||
33 | -#! @PERL@ | ||
34 | +#! /usr/bin/perl | ||
35 | |||
36 | ##--------------------------------------------------------------------## | ||
37 | ##--- Cachegrind's annotator. cg_annotate.in ---## | ||
38 | diff --git a/cachegrind/cg_diff.in b/cachegrind/cg_diff.in | ||
39 | index 9d9258e..d0f0ec7 100755 | ||
40 | --- a/cachegrind/cg_diff.in | ||
41 | +++ b/cachegrind/cg_diff.in | ||
42 | @@ -1,4 +1,4 @@ | ||
43 | -#! @PERL@ | ||
44 | +#! /usr/bin/perl | ||
45 | |||
46 | ##--------------------------------------------------------------------## | ||
47 | ##--- Cachegrind's differencer. cg_diff.in ---## | ||
48 | diff --git a/massif/ms_print.in b/massif/ms_print.in | 27 | diff --git a/massif/ms_print.in b/massif/ms_print.in |
49 | index a206ce4..df1bc31 100755 | 28 | index a206ce4..df1bc31 100755 |
50 | --- a/massif/ms_print.in | 29 | --- a/massif/ms_print.in |
@@ -66,7 +45,7 @@ index 90ee1d2..c585096 100644 | |||
66 | ##--- Valgrind performance testing script vg_perf ---## | 45 | ##--- Valgrind performance testing script vg_perf ---## |
67 | ##--------------------------------------------------------------------## | 46 | ##--------------------------------------------------------------------## |
68 | diff --git a/tests/vg_regtest.in b/tests/vg_regtest.in | 47 | diff --git a/tests/vg_regtest.in b/tests/vg_regtest.in |
69 | index 0fe6341..1b45eb7 100755 | 48 | index 7152765..ad18800 100755 |
70 | --- a/tests/vg_regtest.in | 49 | --- a/tests/vg_regtest.in |
71 | +++ b/tests/vg_regtest.in | 50 | +++ b/tests/vg_regtest.in |
72 | @@ -1,4 +1,4 @@ | 51 | @@ -1,4 +1,4 @@ |
@@ -75,6 +54,3 @@ index 0fe6341..1b45eb7 100755 | |||
75 | ##--------------------------------------------------------------------## | 54 | ##--------------------------------------------------------------------## |
76 | ##--- Valgrind regression testing script vg_regtest ---## | 55 | ##--- Valgrind regression testing script vg_regtest ---## |
77 | ##--------------------------------------------------------------------## | 56 | ##--------------------------------------------------------------------## |
78 | -- | ||
79 | 2.29.2 | ||
80 | |||
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.20.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.21.0.bb index 07e50426e4..717d82830e 100644 --- a/meta/recipes-devtools/valgrind/valgrind_3.20.0.bb +++ b/meta/recipes-devtools/valgrind/valgrind_3.21.0.bb | |||
@@ -27,9 +27,6 @@ SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \ | |||
27 | file://0001-sigqueue-Rename-_sifields-to-__si_fields-on-musl.patch \ | 27 | file://0001-sigqueue-Rename-_sifields-to-__si_fields-on-musl.patch \ |
28 | file://0002-context-APIs-are-not-available-on-musl.patch \ | 28 | file://0002-context-APIs-are-not-available-on-musl.patch \ |
29 | file://0003-correct-include-directive-path-for-config.h.patch \ | 29 | file://0003-correct-include-directive-path-for-config.h.patch \ |
30 | file://0001-memcheck-arm64-Define-__THROW-if-not-already-defined.patch \ | ||
31 | file://0002-memcheck-x86-Define-__THROW-if-not-defined.patch \ | ||
32 | file://0003-tests-seg_override-Replace-__modify_ldt-with-syscall.patch \ | ||
33 | file://0001-fix-opcode-not-supported-on-mips32-linux.patch \ | 30 | file://0001-fix-opcode-not-supported-on-mips32-linux.patch \ |
34 | file://0001-Make-local-functions-static-to-avoid-assembler-error.patch \ | 31 | file://0001-Make-local-functions-static-to-avoid-assembler-error.patch \ |
35 | file://0001-Return-a-valid-exit_code-from-vg_regtest.patch \ | 32 | file://0001-Return-a-valid-exit_code-from-vg_regtest.patch \ |
@@ -39,9 +36,9 @@ SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \ | |||
39 | file://0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch \ | 36 | file://0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch \ |
40 | file://0001-memcheck-tests-Fix-timerfd-syscall-test.patch \ | 37 | file://0001-memcheck-tests-Fix-timerfd-syscall-test.patch \ |
41 | file://0001-docs-Disable-manual-validation.patch \ | 38 | file://0001-docs-Disable-manual-validation.patch \ |
42 | file://0001-drd-tests-Include-missing-cstdint.patch \ | 39 | file://0001-none-tests-x86-linux-seg_override.c-add-missing-incl.patch \ |
43 | " | 40 | " |
44 | SRC_URI[sha256sum] = "8536c031dbe078d342f121fa881a9ecd205cb5a78e639005ad570011bdb9f3c6" | 41 | SRC_URI[sha256sum] = "10ce1618bb3e33fad16eb79552b0a3e1211762448a0d7fce11c8a6243b9ac971" |
45 | UPSTREAM_CHECK_REGEX = "valgrind-(?P<pver>\d+(\.\d+)+)\.tar" | 42 | UPSTREAM_CHECK_REGEX = "valgrind-(?P<pver>\d+(\.\d+)+)\.tar" |
46 | 43 | ||
47 | COMPATIBLE_HOST = '(i.86|x86_64|arm|aarch64|mips|powerpc|powerpc64).*-linux' | 44 | COMPATIBLE_HOST = '(i.86|x86_64|arm|aarch64|mips|powerpc|powerpc64).*-linux' |
@@ -208,13 +205,6 @@ do_install_ptest() { | |||
208 | \) \ | 205 | \) \ |
209 | -exec rm {} \; | 206 | -exec rm {} \; |
210 | 207 | ||
211 | # These files need to be newer so touch them. | ||
212 | touch ${D}${PTEST_PATH}/cachegrind/tests/a.c -r ${D}${PTEST_PATH}/cachegrind/tests/cgout-test | ||
213 | |||
214 | # find *_annotate in ${bindir} for yocto build | ||
215 | sed -i s:\.\./\.\./cachegrind/cg_annotate:${bindir}/cg_annotate: ${D}${PTEST_PATH}/cachegrind/tests/ann1.vgtest | ||
216 | sed -i s:\.\./\.\./cachegrind/cg_annotate:${bindir}/cg_annotate: ${D}${PTEST_PATH}/cachegrind/tests/ann2.vgtest | ||
217 | |||
218 | sed -i s:\.\./\.\./callgrind/callgrind_annotate:${bindir}/callgrind_annotate: ${D}${PTEST_PATH}/callgrind/tests/ann1.vgtest | 208 | sed -i s:\.\./\.\./callgrind/callgrind_annotate:${bindir}/callgrind_annotate: ${D}${PTEST_PATH}/callgrind/tests/ann1.vgtest |
219 | sed -i s:\.\./\.\./callgrind/callgrind_annotate:${bindir}/callgrind_annotate: ${D}${PTEST_PATH}/callgrind/tests/ann2.vgtest | 209 | sed -i s:\.\./\.\./callgrind/callgrind_annotate:${bindir}/callgrind_annotate: ${D}${PTEST_PATH}/callgrind/tests/ann2.vgtest |
220 | 210 | ||