Re: [PATCH 07/12] bundle: run setup_git_directory_gently() sooner
From: Thomas Rast <hidden>
Date: 2016-06-15 22:49:19
Jonathan Nieder wrote:
builtin/bundle.c | 6 ++---- git.c | 2 +- t/t7006-pager.sh | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 5 deletions(-)
[...]
+test_expect_success 'configuration can enable pager (from subdir)' '
+ rm -f paginated.out &&
+ mkdir -p subdir &&
+ git config pager.bundle true &&
+ test_when_finished "git config --unset pager.bundle" &&
+
+ git bundle create test.bundle --all &&
+ rm -f paginated.out subdir/paginated.out &&
+ (
+ cd subdir &&
+ test_terminal git bundle unbundle ../test.bundle
+ ) &&
+ {
+ test -e paginated.out ||
+ test -e subdir/paginated.out
+ }
+'
+
# A colored commit log will begin with an appropriate ANSI escape
# for the first color; the text "commit" comes later.
colorful() {
On my valgrind test setup, this never worked (i.e., fails and bisects
to this commit).
Oddly, I am seeing this error message from the second test (second in
t7006, not in this patch):
expecting success:
rm -f stdout_is_tty ||
cleanup_fail &&
if test -t 1
then
>stdout_is_tty
elif
test_have_prereq PERL &&
"$PERL_PATH" "$TEST_DIRECTORY"/t7006/test-terminal.perl \
sh -c "test -t 1"
then
>test_terminal_works
fi
Can't locate IO/Pty.pm in @INC (@INC contains: <snip>) at /local/home/trast/git/t/t7006/test-terminal.perl line 4.
BEGIN failed--compilation aborted at /local/home/trast/git/t/t7006/test-terminal.perl line 4.
ok 2 - set up terminal for tests
Which raises a few questions: Why was this never an issue before? Am
I supposed to have IO::Pty with a perl install (it's a perl 5.8.8) or
does the test need a prerequisite other than HAVE_PERL?4
--
Thomas Rast
trast@{inf,student}.ethz.ch