threads / patch / 42817

patchFix running tests with --valgrind

Subject: [PATCH] Fix running tests with --valgrind

## tl;dr

2 messages between Jul 11, 2016 and Jul 11, 2016. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Johannes Schindelin· Jul 11, 2016, 11:45 UTC · lore

We forgot to adjust this code path after moving the test helpers to t/helper/.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
Published-As: https://github.com/dscho/git/releases/tag/valgrind-and-test-helpers-v1
 t/test-lib.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Show changes to t/test-lib.sh +1 −1
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 0055ebb..493a92b 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -798,7 +798,7 @@ then
 	# override all git executables in TEST_DIRECTORY/..
 	GIT_VALGRIND=$TEST_DIRECTORY/valgrind
 	mkdir -p "$GIT_VALGRIND"/bin
-	for file in $GIT_BUILD_DIR/git* $GIT_BUILD_DIR/test-*
+	for file in $GIT_BUILD_DIR/git* $GIT_BUILD_DIR/t/helper/test-*
 	do
 		make_valgrind_symlink $file
 	done
-- 
2.9.0.278.g1caae67

base-commit: 5c589a73de4394ad125a4effac227b3aec856fa1
Duy Nguyen· Jul 11, 2016, 15:29 UTC · re: Johannes Schindelin · lore

Re: [PATCH] Fix running tests with --valgrind

On Mon, Jul 11, 2016 at 1:45 PM, Johannes Schindelin <johannes.schindelin@gmx.de> wrote:

> We forgot to adjust this code path after moving the test helpers to
> t/helper/.
Oops. Yet it looks like the right thing to do.
Show 24 quoted lines
>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
> Published-As: https://github.com/dscho/git/releases/tag/valgrind-and-test-helpers-v1
>  t/test-lib.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/t/test-lib.sh b/t/test-lib.sh
> index 0055ebb..493a92b 100644
> --- a/t/test-lib.sh
> +++ b/t/test-lib.sh
> @@ -798,7 +798,7 @@ then
>         # override all git executables in TEST_DIRECTORY/..
>         GIT_VALGRIND=$TEST_DIRECTORY/valgrind
>         mkdir -p "$GIT_VALGRIND"/bin
> -       for file in $GIT_BUILD_DIR/git* $GIT_BUILD_DIR/test-*
> +       for file in $GIT_BUILD_DIR/git* $GIT_BUILD_DIR/t/helper/test-*
>         do
>                 make_valgrind_symlink $file
>         done
> --
> 2.9.0.278.g1caae67
>
> base-commit: 5c589a73de4394ad125a4effac227b3aec856fa1
-- 
Duy

← back to recent threads