Re: [PATCH 2/2] test output: respect $TEST_OUTPUT_DIRECTORY
John Keeping j...@keeping.me.uk writes:
diff --git a/t/test-lib.sh b/t/test-lib.sh
index ca6bdef..70ad085 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -54,8 +54,8 @@ done,*)
# do not redirect again
;;
*' --tee '*|*' --va'*)
- mkdir -p test-results
- BASE=test-results/$(basename $0 .sh)
+ mkdir -p $(TEST_OUTPUT_DIRECTORY)/test-results
+ BASE=$(TEST_OUTPUT_DIRECTORY)/test-results/$(basename $0 .sh)
(GIT_TEST_TEE_STARTED=done ${SHELL_PATH} $0 $@ 21;
echo $? $BASE.exit) | tee $BASE.out
test $(cat $BASE.exit) = 0
Hmm, I initially was too lazy to review this change, and now it's biting
me. The above is Makefile-quoted, which to the shell reads like a
command substitution.
--
Thomas Rast
trast@{inf,student}.ethz.ch
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 2/2] test output: respect $TEST_OUTPUT_DIRECTORY
Thomas Rast tr...@inf.ethz.ch writes:
John Keeping j...@keeping.me.uk writes:
diff --git a/t/test-lib.sh b/t/test-lib.sh
index ca6bdef..70ad085 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -54,8 +54,8 @@ done,*)
# do not redirect again
;;
*' --tee '*|*' --va'*)
-mkdir -p test-results
-BASE=test-results/$(basename $0 .sh)
+mkdir -p $(TEST_OUTPUT_DIRECTORY)/test-results
+BASE=$(TEST_OUTPUT_DIRECTORY)/test-results/$(basename $0 .sh)
(GIT_TEST_TEE_STARTED=done ${SHELL_PATH} $0 $@ 21;
echo $? $BASE.exit) | tee $BASE.out
test $(cat $BASE.exit) = 0
Hmm, I initially was too lazy to review this change, and now it's biting
me. The above is Makefile-quoted, which to the shell reads like a
command substitution.
Heh, when I let my eyes coast over it I didn't notice them either.
Everything in that patch is bad.
This squashed in?
t/test-lib.sh | 4 ++--
t/valgrind/analyze.sh | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 1b1e843..e7d169c 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -54,8 +54,8 @@ done,*)
# do not redirect again
;;
*' --tee '*|*' --va'*)
- mkdir -p $(TEST_OUTPUT_DIRECTORY)/test-results
- BASE=$(TEST_OUTPUT_DIRECTORY)/test-results/$(basename $0 .sh)
+ mkdir -p $TEST_OUTPUT_DIRECTORY/test-results
+ BASE=$TEST_OUTPUT_DIRECTORY/test-results/$(basename $0 .sh)
(GIT_TEST_TEE_STARTED=done ${SHELL_PATH} $0 $@ 21;
echo $? $BASE.exit) | tee $BASE.out
test $(cat $BASE.exit) = 0
diff --git a/t/valgrind/analyze.sh b/t/valgrind/analyze.sh
index 7b58f01..2ffc80f 100755
--- a/t/valgrind/analyze.sh
+++ b/t/valgrind/analyze.sh
@@ -119,7 +119,7 @@ handle_one () {
finish_output
}
-for test_script in $(TEST_OUTPUT_DIRECTORY)/test-results/*.out
+for test_script in $TEST_OUTPUT_DIRECTORY/test-results/*.out
do
handle_one $test_script
done
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 2/2] test output: respect $TEST_OUTPUT_DIRECTORY
On Mon, Apr 29, 2013 at 11:17:00AM -0700, Junio C Hamano wrote:
Thomas Rast tr...@inf.ethz.ch writes:
John Keeping j...@keeping.me.uk writes:
diff --git a/t/test-lib.sh b/t/test-lib.sh
index ca6bdef..70ad085 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -54,8 +54,8 @@ done,*)
# do not redirect again
;;
*' --tee '*|*' --va'*)
- mkdir -p test-results
- BASE=test-results/$(basename $0 .sh)
+ mkdir -p $(TEST_OUTPUT_DIRECTORY)/test-results
+ BASE=$(TEST_OUTPUT_DIRECTORY)/test-results/$(basename $0 .sh)
(GIT_TEST_TEE_STARTED=done ${SHELL_PATH} $0 $@ 21;
echo $? $BASE.exit) | tee $BASE.out
test $(cat $BASE.exit) = 0
Hmm, I initially was too lazy to review this change, and now it's biting
me. The above is Makefile-quoted, which to the shell reads like a
command substitution.
Heh, when I let my eyes coast over it I didn't notice them either.
Everything in that patch is bad.
This squashed in?
This is identical to the interdiff of what I posted at the same time, so
it obviously looks good to me.
t/test-lib.sh | 4 ++--
t/valgrind/analyze.sh | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 1b1e843..e7d169c 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -54,8 +54,8 @@ done,*)
# do not redirect again
;;
*' --tee '*|*' --va'*)
- mkdir -p $(TEST_OUTPUT_DIRECTORY)/test-results
- BASE=$(TEST_OUTPUT_DIRECTORY)/test-results/$(basename $0 .sh)
+ mkdir -p $TEST_OUTPUT_DIRECTORY/test-results
+ BASE=$TEST_OUTPUT_DIRECTORY/test-results/$(basename $0 .sh)
(GIT_TEST_TEE_STARTED=done ${SHELL_PATH} $0 $@ 21;
echo $? $BASE.exit) | tee $BASE.out
test $(cat $BASE.exit) = 0
diff --git a/t/valgrind/analyze.sh b/t/valgrind/analyze.sh
index 7b58f01..2ffc80f 100755
--- a/t/valgrind/analyze.sh
+++ b/t/valgrind/analyze.sh
@@ -119,7 +119,7 @@ handle_one () {
finish_output
}
-for test_script in $(TEST_OUTPUT_DIRECTORY)/test-results/*.out
+for test_script in $TEST_OUTPUT_DIRECTORY/test-results/*.out
do
handle_one $test_script
done
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 2/2] test output: respect $TEST_OUTPUT_DIRECTORY
John Keeping j...@keeping.me.uk writes: This is identical to the interdiff of what I posted at the same time, so it obviously looks good to me. Thanks. I've replaced the old tip with your version. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 2/2] test output: respect $TEST_OUTPUT_DIRECTORY
Most test results go in $TEST_OUTPUT_DIRECTORY, but the output files for
tests run with --tee or --valgrind just use bare test-results.
Changes these so that they do respect $TEST_OUTPUT_DIRECTORY.
As a result of this, the valgrind/analyze.sh script may no longer
inspect the correct files so it is also updated to respect
$TEST_OUTPUT_DIRECTORY by adding it to GIT-BUILD-OPTIONS. This may be a
regression for people who have TEST_OUTPUT_DIRECTORY in their config.mak
but want to override it in the environment, but this change merely
brings it into line with GIT_TEST_OPTS which already cannot be
overridden if it is specified in config.mak.
Signed-off-by: John Keeping j...@keeping.me.uk
---
Makefile | 3 +++
t/test-lib.sh | 4 ++--
t/valgrind/analyze.sh | 8 ++--
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index 90661a2..d4d95fa 100644
--- a/Makefile
+++ b/Makefile
@@ -2166,6 +2166,9 @@ GIT-BUILD-OPTIONS: FORCE
@echo NO_PERL=\''$(subst ','\'',$(subst ','\'',$(NO_PERL)))'\' $@
@echo NO_PYTHON=\''$(subst ','\'',$(subst ','\'',$(NO_PYTHON)))'\' $@
@echo NO_UNIX_SOCKETS=\''$(subst ','\'',$(subst
','\'',$(NO_UNIX_SOCKETS)))'\' $@
+ifdef TEST_OUTPUT_DIRECTORY
+ @echo TEST_OUTPUT_DIRECTORY=\''$(subst ','\'',$(subst
','\'',$(TEST_OUTPUT_DIRECTORY)))'\' $@
+endif
ifdef GIT_TEST_OPTS
@echo GIT_TEST_OPTS=\''$(subst ','\'',$(subst
','\'',$(GIT_TEST_OPTS)))'\' $@
endif
diff --git a/t/test-lib.sh b/t/test-lib.sh
index ca6bdef..70ad085 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -54,8 +54,8 @@ done,*)
# do not redirect again
;;
*' --tee '*|*' --va'*)
- mkdir -p test-results
- BASE=test-results/$(basename $0 .sh)
+ mkdir -p $(TEST_OUTPUT_DIRECTORY)/test-results
+ BASE=$(TEST_OUTPUT_DIRECTORY)/test-results/$(basename $0 .sh)
(GIT_TEST_TEE_STARTED=done ${SHELL_PATH} $0 $@ 21;
echo $? $BASE.exit) | tee $BASE.out
test $(cat $BASE.exit) = 0
diff --git a/t/valgrind/analyze.sh b/t/valgrind/analyze.sh
index d8105d9..7b58f01 100755
--- a/t/valgrind/analyze.sh
+++ b/t/valgrind/analyze.sh
@@ -1,6 +1,10 @@
#!/bin/sh
-out_prefix=$(dirname $0)/../test-results/valgrind.out
+# Get TEST_OUTPUT_DIRECTORY from GIT-BUILD-OPTIONS if it's there...
+. $(dirname $0)/../../GIT-BUILD-OPTIONS
+# ... otherwise set it to the default value.
+: ${TEST_OUTPUT_DIRECTORY=$(dirname $0)/..}
+
output=
count=0
total_count=0
@@ -115,7 +119,7 @@ handle_one () {
finish_output
}
-for test_script in $(dirname $0)/../test-results/*.out
+for test_script in $(TEST_OUTPUT_DIRECTORY)/test-results/*.out
do
handle_one $test_script
done
--
1.8.2.1.715.gb260f47
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
