diff options
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | sequencer.c | 2 | ||||
| -rwxr-xr-x | t/t0021-conversion.sh | 3 | ||||
| -rwxr-xr-x | t/t6026-merge-attr.sh | 18 |
5 files changed, 18 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index 9a65514d8..0b2ea5c3e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,7 +32,6 @@ env: - DEFAULT_TEST_TARGET=prove - GIT_PROVE_OPTS="--timer --jobs 3 --state=failed,slow,save" - GIT_TEST_OPTS="--verbose-log" - - GIT_TEST_HTTPD=true - GIT_TEST_CLONE_2GB=YesPlease # t9810 occasionally fails on Travis CI OS X # t9816 occasionally fails with "TAP out of sequence errors" on Travis CI OS X @@ -57,6 +56,8 @@ before_install: - > case "${TRAVIS_OS_NAME:-linux}" in linux) + export GIT_TEST_HTTPD=YesPlease + mkdir --parents custom/p4 pushd custom/p4 wget --quiet http://filehost.perforce.com/perforce/r$LINUX_P4_VERSION/bin.linux26x86_64/p4d @@ -1047,6 +1047,7 @@ ifeq ($(uname_S),Darwin) endif endif ifndef NO_APPLE_COMMON_CRYPTO + NO_OPENSSL = YesPlease APPLE_COMMON_CRYPTO = YesPlease COMPAT_CFLAGS += -DAPPLE_COMMON_CRYPTO endif diff --git a/sequencer.c b/sequencer.c index 5fd75f30d..6f0ff9e41 100644 --- a/sequencer.c +++ b/sequencer.c @@ -629,7 +629,7 @@ static const char *todo_command_strings[] = { static const char *command_to_string(const enum todo_command command) { - if (command < ARRAY_SIZE(todo_command_strings)) + if ((size_t)command < ARRAY_SIZE(todo_command_strings)) return todo_command_strings[command]; die("Unknown command: %d", command); } diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh index b93cd4454..4ea534e9f 100755 --- a/t/t0021-conversion.sh +++ b/t/t0021-conversion.sh @@ -29,8 +29,7 @@ file_size () { filter_git () { rm -f rot13-filter.log && - git "$@" 2>git-stderr.log && - rm -f git-stderr.log + git "$@" } # Compare two files and ensure that `clean` and `smudge` respectively are diff --git a/t/t6026-merge-attr.sh b/t/t6026-merge-attr.sh index 7a6e33e67..8f9b48a49 100755 --- a/t/t6026-merge-attr.sh +++ b/t/t6026-merge-attr.sh @@ -183,16 +183,24 @@ test_expect_success 'up-to-date merge without common ancestor' ' test_expect_success 'custom merge does not lock index' ' git reset --hard anchor && - write_script sleep-one-second.sh <<-\EOF && - sleep 1 & + write_script sleep-an-hour.sh <<-\EOF && + sleep 3600 & echo $! >sleep.pid EOF - test_when_finished "kill \$(cat sleep.pid)" && test_write_lines >.gitattributes \ - "* merge=ours" "text merge=sleep-one-second" && + "* merge=ours" "text merge=sleep-an-hour" && test_config merge.ours.driver true && - test_config merge.sleep-one-second.driver ./sleep-one-second.sh && + test_config merge.sleep-an-hour.driver ./sleep-an-hour.sh && + + # We are testing that the custom merge driver does not block + # index.lock on Windows due to an inherited file handle. + # To ensure that the backgrounded process ran sufficiently + # long (and has been started in the first place), we do not + # ignore the result of the kill command. + # By packaging the command in test_when_finished, we get both + # the correctness check and the clean-up. + test_when_finished "kill \$(cat sleep.pid)" && git merge master ' |