|
36 | 36 | fi
|
37 | 37 | GIT_BUILD_DIR="$TEST_DIRECTORY"/..
|
38 | 38 |
|
| 39 | +# Prepend a string to a VAR using an arbitrary ":" delimiter, not |
| 40 | +# adding the delimiter if VAR or VALUE is empty. I.e. a generalized: |
| 41 | +# |
| 42 | +# VAR=$1${VAR:+${1:+$2}$VAR} |
| 43 | +# |
| 44 | +# Usage (using ":" as the $2 delimiter): |
| 45 | +# |
| 46 | +# prepend_var VAR : VALUE |
| 47 | +prepend_var () { |
| 48 | + eval "$1=$3\${$1:+${3:+$2}\$$1}" |
| 49 | +} |
| 50 | + |
| 51 | +# If [AL]SAN is in effect we want to abort so that we notice |
| 52 | +# problems. The GIT_SAN_OPTIONS variable can be used to set common |
| 53 | +# defaults shared between [AL]SAN_OPTIONS. |
| 54 | +prepend_var GIT_SAN_OPTIONS : abort_on_error=1 |
| 55 | + |
39 | 56 | # If we were built with ASAN, it may complain about leaks
|
40 | 57 | # of program-lifetime variables. Disable it by default to lower
|
41 | 58 | # the noise level. This needs to happen at the start of the script,
|
42 | 59 | # before we even do our "did we build git yet" check (since we don't
|
43 | 60 | # want that one to complain to stderr).
|
44 |
| -: ${ASAN_OPTIONS=detect_leaks=0:abort_on_error=1} |
| 61 | +prepend_var ASAN_OPTIONS : $GIT_SAN_OPTIONS |
| 62 | +prepend_var ASAN_OPTIONS : detect_leaks=0 |
45 | 63 | export ASAN_OPTIONS
|
46 | 64 |
|
47 |
| -# If LSAN is in effect we _do_ want leak checking, but we still |
48 |
| -# want to abort so that we notice the problems. |
49 |
| -: ${LSAN_OPTIONS=abort_on_error=1} |
| 65 | +prepend_var LSAN_OPTIONS : $GIT_SAN_OPTIONS |
50 | 66 | export LSAN_OPTIONS
|
51 | 67 |
|
52 | 68 | if test ! -f "$GIT_BUILD_DIR"/GIT-BUILD-OPTIONS
|
|
0 commit comments