Skip to content

Commit 9b8ef30

Browse files
committed
Get Travis to respect $? passed via trace function
1 parent dc68e35 commit 9b8ef30

File tree

4 files changed

+12
-8
lines changed

4 files changed

+12
-8
lines changed

developer-scripts/travis/install.linux.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ __file=developer-scripts/travis/install.linux.sh
1313
__caf_err_report() {
1414
local error_code
1515
error_code=${?}
16-
echo "Error in ${__file} in function ${1} on line ${2}." >&2
17-
exit ${error_code}
16+
echo "Error (code=${error_code}) in ${__file} in function ${1} on line ${2}." >&2
17+
false
18+
return ${error_code}
1819
}
1920
# Always provide an error backtrace
2021
trap '__caf_err_report "${FUNCNAME:-.}" ${LINENO}' ERR

developer-scripts/travis/install.osx.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ __file=developer-scripts/travis/install.osx.sh
1313
__caf_err_report() {
1414
local error_code
1515
error_code=${?}
16-
echo "Error in ${__file} in function ${1} on line ${2}." >&2
17-
exit ${error_code}
16+
echo "Error (code=${error_code}) in ${__file} in function ${1} on line ${2}." >&2
17+
false
18+
return ${error_code}
1819
}
1920
# Always provide an error backtrace
2021
trap '__caf_err_report "${FUNCNAME:-.}" ${LINENO}' ERR

developer-scripts/travis/test-script.InstallScript.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ __file=developer-scripts/travis/test-script.InstallScript.sh
1313
__caf_err_report() {
1414
local error_code
1515
error_code=${?}
16-
echo "Error in ${__file} in function ${1} on line ${2}." >&2
17-
exit ${error_code}
16+
echo "Error (code=${error_code}) in ${__file} in function ${1} on line ${2}." >&2
17+
false
18+
return ${error_code}
1819
}
1920
# Always provide an error backtrace
2021
trap '__caf_err_report "${FUNCNAME:-.}" ${LINENO}' ERR

developer-scripts/travis/test-script.cmake.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ __file=developer-scripts/travis/test-script.cmake.sh
1313
__caf_err_report() {
1414
local error_code
1515
error_code=${?}
16-
echo "Error in ${__file} in function ${1} on line ${2}." >&2
17-
exit ${error_code}
16+
echo "Error (code=${error_code}) in ${__file} in function ${1} on line ${2}." >&2
17+
false
18+
return ${error_code}
1819
}
1920
# Always provide an error backtrace
2021
trap '__caf_err_report "${FUNCNAME:-.}" ${LINENO}' ERR

0 commit comments

Comments
 (0)