mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
travis: dedent a few scripts that are indented overly deeply
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
09f5e9746c
commit
f67242c10d
|
@ -5,33 +5,36 @@
|
|||
|
||||
. ${0%/*}/lib-travisci.sh
|
||||
|
||||
case "${TRAVIS_OS_NAME:-linux}" in
|
||||
linux)
|
||||
export GIT_TEST_HTTPD=YesPlease
|
||||
P4WHENCE=http://filehost.perforce.com/perforce/r$LINUX_P4_VERSION
|
||||
LFSWHENCE=https://github.com/github/git-lfs/releases/download/v$LINUX_GIT_LFS_VERSION
|
||||
|
||||
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
|
||||
case "${TRAVIS_OS_NAME:-linux}" in
|
||||
linux)
|
||||
export GIT_TEST_HTTPD=YesPlease
|
||||
|
||||
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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue