On (02/10/15 17:23), Nikolai Kondrashov wrote:
On 10/02/2015 04:54 PM, Nikolai Kondrashov wrote:
>On 10/02/2015 04:49 PM, Lukas Slebodnik wrote:
>>On (02/10/15 16:09), Nikolai Kondrashov wrote:
>>>On 10/02/2015 03:22 PM, Lukas Slebodnik wrote:
>>>>attached patch should fix valgrind issues with whitespace_test
>>>
>>>Thank you, Lukas. This seems fine. I have also made another patch which
>>>excludes whitespace_test from Valgrind run instead of renaming it.
>>>
>>>I'm not sure which is better and actually don't quite understand how
your
>>>version works, but here it is :)
>>>
>>>Nick
>>
>>>From 72533b05c2b2bcb90771bf9c91e9dade6e94b579 Mon Sep 17 00:00:00 2001
>>>From: Nikolai Kondrashov <Nikolai.Kondrashov(a)redhat.com>
>>>Date: Fri, 2 Oct 2015 15:54:23 +0300
>>>Subject: [PATCH] CI: Exclude whitespace_test from Valgrind checks
>>>
>>>Exclude whitespace_test from Valgrind checks in contrib/ci/run to
>>>prevent it from failing the tests due to Bash bugs.
>>>---
>>>contrib/ci/run | 2 +-
>>>1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>>diff --git a/contrib/ci/run b/contrib/ci/run
>>>index 5f668ff..4d89c8a 100755
>>>--- a/contrib/ci/run
>>>+++ b/contrib/ci/run
>>>@@ -206,7 +206,7 @@ function build_debug()
>>> make-check-wrap -j $CPU_NUM check -- \
>>> libtool --mode=execute \
>>> valgrind-condense 99 \
>>>- '!(*.py|*dlopen-tests)' -- \
>>>+
'!(*.py|*dlopen-tests|*/whitespace_test)' -- \
>>This patch is simpler. So it would be better to use this way.
>
>Alright.
>
>>I have never understood what is the purpose of this regex.
>
>Yeah, it is only expained in contrib/ci/valgrind-condense.
>
>>Would make sense to move it into separate variable
>>with meaningful name?
>
>Yeah, I'll remake the patch to also do that. It's getting longish anyway.
Alright, here's the patch.
I also added a slash before dlopen-tests in the pattern to make it slightly
more specific. It doesn't break anything. I can make a separate patch, if
necessary.
From f5f68f5f3689ad41ea91350aec9822977036227e Mon Sep 17 00:00:00
2001
From: Nikolai Kondrashov <Nikolai.Kondrashov(a)redhat.com>
Date: Fri, 2 Oct 2015 15:54:23 +0300
Subject: [PATCH] CI: Exclude whitespace_test from Valgrind checks
Exclude whitespace_test from Valgrind checks in contrib/ci/run to
prevent it from failing the tests due to Bash bugs.
---
contrib/ci/run | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/contrib/ci/run b/contrib/ci/run
index 5f668ff..a65ad8d 100755
--- a/contrib/ci/run
+++ b/contrib/ci/run
@@ -185,6 +185,9 @@ enabled=1
# Run debug build checks.
function build_debug()
{
+ # Extended glob pattern matching tests to run under Valgrind.
+ # NOTE: The particular pattern below is inverted
+ declare -r
valgrind_test_pattern="!(*.py|*/dlopen-tests|*/whitespace_test)"
export CFLAGS="$DEBUG_CFLAGS"
declare test_dir
declare test_dir_distcheck
@@ -206,7 +209,7 @@ function build_debug()
make-check-wrap -j $CPU_NUM check -- \
libtool --mode=execute \
valgrind-condense 99 \
- '!(*.py|*dlopen-tests)' -- \
+ "$valgrind_test_pattern" -- \
It
looks better now.
Thank you very much.
ACK
LS