Skip to content

Commit 20821d1

Browse files
committed
Symbolic names for finish
1 parent 1d50e84 commit 20821d1

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

travis-ci

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ fi
2828

2929
finish() {
3030
local EXIT=0
31-
if ! wait "$1"; then
31+
if ! wait "${!1}"; then
3232
EXIT=$?
3333
cat "$OUT"
3434
fi
@@ -39,9 +39,9 @@ concurrently() {
3939
local VAR="$1"
4040
shift
4141
"$@" >> "$OUT" 2>&1 &
42-
PID=$!
42+
local PID=$!
4343
export "$VAR"=$PID
44-
if [ "$INSTALL_WAIT" = 1 ]; then finish $PID; fi
44+
if [ "$INSTALL_WAIT" = 1 ]; then finish "$VAR"; fi
4545
}
4646

4747
folded() {
@@ -75,18 +75,18 @@ if ! command -v cppsm > /dev/null; then
7575
export PATH="$PWD/.cppsm/.cli/bin:$PATH"
7676
fi
7777

78-
folded ... finish "$GIT_UPDATE_PID"
78+
folded ... finish GIT_UPDATE_PID
7979

8080
for CONFIG in Debug Release; do
8181
export CMAKE_BUILD_TYPE=$CONFIG
8282
if [ "$TRAVIS_OS_NAME" = "linux" ]; then
83-
folded ... finish "$LIBSTD_INSTALL_PID"
83+
folded ... finish LIBSTD_INSTALL_PID
8484
CC="clang" CXX="clang++" folded "Clang $CONFIG" cppsm test
85-
folded ... finish "$GCC_INSTALL_PID"
85+
folded ... finish GCC_INSTALL_PID
8686
CC="gcc-8" CXX="g++-8" folded "GCC $CONFIG" cppsm test
8787
elif [ "$TRAVIS_OS_NAME" = "windows" ]; then
8888
CC="" CXX="" folded "VC $CONFIG" cppsm test
89-
folded ... finish "$MAKE_INSTALL_PID"
89+
folded ... finish MAKE_INSTALL_PID
9090
CC="gcc" CXX="g++" folded "GCC $CONFIG" cppsm test
9191
elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
9292
CC="clang" CXX="clang++" folded "Clang $CONFIG" cppsm test
@@ -116,10 +116,10 @@ format-check() {
116116

117117
if [ "$TRAVIS_OS_NAME" = "osx" ]; then
118118
if [ -n "$CODECOV" ]; then
119-
folded ... finish "$LCOV_INSTALL_PID"
119+
folded ... finish LCOV_INSTALL_PID
120120
fi
121121
folded "Code coverage" code-coverage
122-
folded ... finish "$FORMAT_INSTALL_PID"
122+
folded ... finish FORMAT_INSTALL_PID
123123
folded "Format check" format-check
124124
fi
125125

0 commit comments

Comments
 (0)