ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'blkd-err' of https://github.com/evverx/util-linux 

* 'blkd-err' of https://github.com/evverx/util-linux:
  tests: turn off detect_leaks on s390x, use more asan options
  tests: skip "blkid/dm-err" when `mknod` doesn't work
This commit is contained in:
Karel Zak 2020-07-07 14:24:41 +02:00
parent 7586e9d1aa 1b9f2ff333
commit 2b41c409e7
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/functions.sh
View File

@ -442,6 +442,7 @@ function ts_init_py {
function ts_run {
declare -a args
local asan_options="strict_string_checks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1"
#
# ASAN mode
@ -449,7 +450,11 @@ function ts_run {
if [ "$TS_ENABLE_ASAN" == "yes" -o "$TS_ENABLE_UBSAN" == "yes" ]; then
args+=(env)
if [ "$TS_ENABLE_ASAN" == "yes" ]; then
args+=(ASAN_OPTIONS=detect_leaks=1)
# detect_leaks isn't supported on s390x: https://github.com/llvm/llvm-project/blob/master/compiler-rt/lib/lsan/lsan_common.h
if [ "$(uname -m)" != "s390x" ]; then
asan_options="$asan_options:detect_leaks=1"
fi
args+=(ASAN_OPTIONS=$asan_options)
fi
if [ "$TS_ENABLE_UBSAN" == "yes" ]; then
args+=(UBSAN_OPTIONS=print_stacktrace=1:print_summary=1:halt_on_error=1)

7
tests/ts/blkid/dm-err
View File

@ -33,6 +33,13 @@ DEVICE="/dev/mapper/${DEVNAME}"
ts_log "Initialize device"
echo "0 262144 error" | dmsetup create $DEVNAME
# Some tests are run in LXD containers on Travis CI where `mknod` doesn't always work
# https://docs.travis-ci.com/user/multi-cpu-architectures/#security-and-lxd-container
# https://linuxcontainers.org/lxd/docs/master/syscall-interception
if [ "$TRAVIS" == "true" ] && [ ! -b "$DEVICE" ]; then
ts_skip "$DEVICE wasn't created"
fi
ts_log "Probe device"
$TS_CMD_BLKID -p -o udev $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG
echo "Return code: $?" >> $TS_OUTPUT