Merge branch 'tests-refactor-loop-cleanup' of https://github.com/rudimeier/util-linux

* 'tests-refactor-loop-cleanup' of https://github.com/rudimeier/util-linux:
  tests: never use -o pipefail
  tests: loop tests, don't call ts_die() with DEVICE parameter
  tests: scsi_debug tests, don't call ts_die() with DEVICE parameter
  tests: introduce TS_LOOP_DEVS for cleanup
  tests: introduce ts_cleanup_on_exit()

diff --cc tests/functions.sh
Simple merge

diff --cc tests/ts/libmount/context
index 15693d1c6cbfcc014e61f9179db0bd42836fc54d,373e1d3d1468f2f3d3d726974c1c1f6f2d5e7e95..9424fef90bc2d3a50c3623aace751451744d4b68
--- 1/tests/ts/libmount/context
--- 2/tests/ts/libmount/context
+++ b/tests/ts/libmount/context
@@@ -69,21 -64,9 +69,21 @@@ ts_log "Do tests...
  export LIBMOUNT_MTAB=$TS_OUTPUT.mtab
  > $LIBMOUNT_MTAB
  
 +# check local mtab of system mountinfo
 +function is_mounted {
 +      if [ "$MOUNTINFO_ONLY" = "yes" ]; then
 +              ts_is_mounted "$1"
 +              return $?
 +      fi
 +      grep -q "$1" $LIBMOUNT_MTAB && return 0
 +      return 1
 +}
 +
 +
  udevadm settle
- ts_device_has "TYPE" "ext4" $DEVICE || ts_die "Cannot find ext3 on $DEVICE" $DEVICE
+ ts_device_has "TYPE" "ext4" $DEVICE || ts_die "Cannot find ext3 on $DEVICE"
  
 +
  ts_init_subtest "mount-by-devname"
  mkdir -p $MOUNTPOINT &>  /dev/null
  ts_valgrind $TESTPROG --mount $DEVICE $MOUNTPOINT >> $TS_OUTPUT 2>&1

diff --cc tests/ts/libmount/context-py
index f2190ce8a718f6378aa6f318734623f475786eaf,94c0d071b415fa235d4c3b25b2b7f48729207763..0f8398f6efa193f532a9c30d2e89a096a8c93434
--- 1/tests/ts/libmount/context-py
--- 2/tests/ts/libmount/context-py
+++ b/tests/ts/libmount/context-py
@@@ -71,21 -66,9 +71,21 @@@ ts_log "Do tests...
  export LIBMOUNT_MTAB=$TS_OUTPUT.mtab
  > $LIBMOUNT_MTAB
  
 +# check local mtab of system mountinfo
 +function is_mounted {
 +      if [ "$MOUNTINFO_ONLY" = "yes" ]; then
 +              ts_is_mounted "$1"
 +              return $?
 +      fi
 +      grep -q "$1" $LIBMOUNT_MTAB && return 0
 +      return 1
 +}
 +
 +
  udevadm settle
- ts_device_has "TYPE" "ext4" $DEVICE || ts_die "Cannot find ext3 on $DEVICE" $DEVICE
+ ts_device_has "TYPE" "ext4" $DEVICE || ts_die "Cannot find ext3 on $DEVICE"
  
 +
  ts_init_subtest "mount-by-devname"
  mkdir -p $MOUNTPOINT &>  /dev/null
  $PYTHON $TESTPROG --mount $DEVICE $MOUNTPOINT >> $TS_OUTPUT 2>&1