diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-09-11 10:18:29 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-11 10:18:29 +0900 |
| commit | f67242c10ddf24a14b5085b1effcbe818aa007e6 (patch) | |
| tree | 29c073016f78a36aca602461026da68cb12f4ea5 /ci | |
| parent | 09f5e9746ce8be640683f9f5f1ffb54a34d4dc90 (diff) | |
| download | git-f67242c10ddf24a14b5085b1effcbe818aa007e6.tar.gz git-f67242c10ddf24a14b5085b1effcbe818aa007e6.tar.xz | |
travis: dedent a few scripts that are indented overly deeply
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/install-dependencies.sh | 51 | ||||
| -rwxr-xr-x | ci/print-test-failures.sh | 18 |
2 files changed, 36 insertions, 33 deletions
diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index 067e6eb70..a29246af3 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -5,33 +5,36 @@ . ${0%/*}/lib-travisci.sh +P4WHENCE=http://filehost.perforce.com/perforce/r$LINUX_P4_VERSION +LFSWHENCE=https://github.com/github/git-lfs/releases/download/v$LINUX_GIT_LFS_VERSION + case "${TRAVIS_OS_NAME:-linux}" in - linux) - export GIT_TEST_HTTPD=YesPlease +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 - wget --quiet http://filehost.perforce.com/perforce/r$LINUX_P4_VERSION/bin.linux26x86_64/p4 - chmod u+x p4d - chmod u+x p4 - export PATH="$(pwd):$PATH" - popd - mkdir --parents custom/git-lfs - pushd custom/git-lfs - wget --quiet https://github.com/github/git-lfs/releases/download/v$LINUX_GIT_LFS_VERSION/git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz - tar --extract --gunzip --file "git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz" - cp git-lfs-$LINUX_GIT_LFS_VERSION/git-lfs . - export PATH="$(pwd):$PATH" - popd + mkdir --parents custom/p4 + pushd custom/p4 + wget --quiet "$P4WHENCE/bin.linux26x86_64/p4d" + wget --quiet "$P4WHENCE/bin.linux26x86_64/p4" + chmod u+x p4d + chmod u+x p4 + export PATH="$(pwd):$PATH" + popd + mkdir --parents custom/git-lfs + pushd custom/git-lfs + wget --quiet "$LFSWHENCE/git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz" + tar --extract --gunzip --file "git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz" + cp git-lfs-$LINUX_GIT_LFS_VERSION/git-lfs . + export PATH="$(pwd):$PATH" + popd ;; - osx) - brew update --quiet - # Uncomment this if you want to run perf tests: - # brew install gnu-time - brew install git-lfs gettext - brew link --force gettext - brew install caskroom/cask/perforce +osx) + brew update --quiet + # Uncomment this if you want to run perf tests: + # brew install gnu-time + brew install git-lfs gettext + brew link --force gettext + brew install caskroom/cask/perforce ;; esac diff --git a/ci/print-test-failures.sh b/ci/print-test-failures.sh index 8583e6183..8c8973cbf 100755 --- a/ci/print-test-failures.sh +++ b/ci/print-test-failures.sh @@ -6,13 +6,13 @@ . ${0%/*}/lib-travisci.sh for TEST_EXIT in t/test-results/*.exit - do - if [ "$(cat "$TEST_EXIT")" != "0" ] - then - TEST_OUT="${TEST_EXIT%exit}out" - echo "------------------------------------------------------------------------" - echo "$(tput setaf 1)${TEST_OUT}...$(tput sgr0)" - echo "------------------------------------------------------------------------" - cat "${TEST_OUT}" - fi +do + if [ "$(cat "$TEST_EXIT")" != "0" ] + then + TEST_OUT="${TEST_EXIT%exit}out" + echo "------------------------------------------------------------------------" + echo "$(tput setaf 1)${TEST_OUT}...$(tput sgr0)" + echo "------------------------------------------------------------------------" + cat "${TEST_OUT}" + fi done |