undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

travis: dedent a few scripts that are indented overly deeply

Browse Source 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2017-09-11 10:18:29 +09:00
parent 09f5e9746c
commit f67242c10d
2 changed files with 37 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
ci/install-dependencies.sh
View File

@ -5,33 +5,36 @@
. ${0%/*}/lib-travisci.sh . ${0%/*}/lib-travisci.sh
case "${TRAVIS_OS_NAME:-linux}" in P4WHENCE=http://filehost.perforce.com/perforce/r$LINUX_P4_VERSION
linux) LFSWHENCE=https://github.com/github/git-lfs/releases/download/v$LINUX_GIT_LFS_VERSION
export GIT_TEST_HTTPD=YesPlease
mkdir --parents custom/p4 case "${TRAVIS_OS_NAME:-linux}" in
pushd custom/p4 linux)
wget --quiet http://filehost.perforce.com/perforce/r$LINUX_P4_VERSION/bin.linux26x86_64/p4d export GIT_TEST_HTTPD=YesPlease
wget --quiet http://filehost.perforce.com/perforce/r$LINUX_P4_VERSION/bin.linux26x86_64/p4
chmod u+x p4d mkdir --parents custom/p4
chmod u+x p4 pushd custom/p4
export PATH="$(pwd):$PATH" wget --quiet "$P4WHENCE/bin.linux26x86_64/p4d"
popd wget --quiet "$P4WHENCE/bin.linux26x86_64/p4"
mkdir --parents custom/git-lfs chmod u+x p4d
pushd custom/git-lfs chmod u+x p4
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 export PATH="$(pwd):$PATH"
tar --extract --gunzip --file "git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz" popd
cp git-lfs-$LINUX_GIT_LFS_VERSION/git-lfs . mkdir --parents custom/git-lfs
export PATH="$(pwd):$PATH" pushd custom/git-lfs
popd 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) osx)
brew update --quiet brew update --quiet
# Uncomment this if you want to run perf tests: # Uncomment this if you want to run perf tests:
# brew install gnu-time # brew install gnu-time
brew install git-lfs gettext brew install git-lfs gettext
brew link --force gettext brew link --force gettext
brew install caskroom/cask/perforce brew install caskroom/cask/perforce
;; ;;
esac esac

18
ci/print-test-failures.sh
View File

@ -6,13 +6,13 @@
. ${0%/*}/lib-travisci.sh . ${0%/*}/lib-travisci.sh
for TEST_EXIT in t/test-results/*.exit for TEST_EXIT in t/test-results/*.exit
do do
if [ "$(cat "$TEST_EXIT")" != "0" ] if [ "$(cat "$TEST_EXIT")" != "0" ]
then then
TEST_OUT="${TEST_EXIT%exit}out" TEST_OUT="${TEST_EXIT%exit}out"
echo "------------------------------------------------------------------------" echo "------------------------------------------------------------------------"
echo "$(tput setaf 1)${TEST_OUT}...$(tput sgr0)" echo "$(tput setaf 1)${TEST_OUT}...$(tput sgr0)"
echo "------------------------------------------------------------------------" echo "------------------------------------------------------------------------"
cat "${TEST_OUT}" cat "${TEST_OUT}"
fi fi
done done