diff options
| author | Karel Zak | 2007-12-06 22:46:00 +0100 |
|---|---|---|
| committer | Karel Zak | 2007-12-06 22:46:00 +0100 |
| commit | b7ea07e0c9b96b83087c41dafdd974909a696dd4 (patch) | |
| tree | 92d9f101d638e4a47db180d1e7dd37976bc0428b /tests/functions.sh | |
| parent | docs: add note about incorrect tag 2.13.1 (diff) | |
| download | kernel-qcow2-util-linux-b7ea07e0c9b96b83087c41dafdd974909a696dd4.tar.gz kernel-qcow2-util-linux-b7ea07e0c9b96b83087c41dafdd974909a696dd4.tar.xz kernel-qcow2-util-linux-b7ea07e0c9b96b83087c41dafdd974909a696dd4.zip | |
tests: redirect libblkid cache to BLKID_FILE
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'tests/functions.sh')
| -rw-r--r-- | tests/functions.sh | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/tests/functions.sh b/tests/functions.sh index 660e4adfe..585773152 100644 --- a/tests/functions.sh +++ b/tests/functions.sh @@ -83,20 +83,15 @@ function ts_init { TS_EXPECTED="$TS_EXPECTEDDIR/$TS_NAME" TS_INPUT="$TS_INPUTDIR/$TS_NAME" TS_MOUNTPOINT="$(pwd)/$TS_OUTDIR/${TS_NAME}_mnt" - TS_BLKIDCACHE="" TS_HAS_VOLUMEID="no" + BLKID_FILE="$TS_OUTDIR/$TS_NAME.blkidtab" + + export BLKID_FILE ldd $TS_CMD_MOUNT | grep -q 'libvolume_id' &> /dev/null if [ "$?" == "0" ]; then TS_HAS_VOLUMEID="yes" fi - if [ "$TS_HAS_VOLUMEID" != "yes" ]; then - if [ -f "/etc/blkid/blkid.tab" ]; then - TS_BLKIDCACHE="/etc/blkid/blkid.tab" - elif [ -f "/etc/blkid.tab" ]; then - TS_BLKIDCACHE="/etc/blkid.tab" - fi - fi rm -f $TS_OUTPUT touch $TS_OUTPUT @@ -155,28 +150,10 @@ function ts_die { ts_finalize } -function ts_backup_cache { - if [ "$TS_HAS_VOLUMEID" != "yes" ] && [ -f "$TS_BLKIDCACHE" ]; then - cp $TS_BLKIDCACHE $OUTDIR/$TS_NAME.cache - fi -} - -function ts_restore_cache { - if [ "$TS_HAS_VOLUMEID" != "yes" ] && [ -f "$TS_BLKIDCACHE" ] && [ -s "$OUTDIR/$TS_NAME.cache" ]; then - # We have to remove the device from cache otherwise - # libblkid will reuse cached information. The cache - # refresh time is 2 seconds -- that's too long. We - # re-use the same device more quickly. --kzak - mv -f $OUTDIR/$TS_NAME.cache $TS_BLKIDCACHE - fi -} - function ts_device_init { local IMAGE="$TS_OUTDIR/$TS_NAME.img" local DEV="" - ts_backup_cache - dd if=/dev/zero of="$IMAGE" bs=1M count=5 &> /dev/null DEV=$($TS_CMD_LOSETUP -s -f "$IMAGE") @@ -198,7 +175,6 @@ function ts_device_deinit { if [ -b "$DEV" ]; then $TS_CMD_UMOUNT "$DEV" &> /dev/null $TS_CMD_LOSETUP -d "$DEV" &> /dev/null - ts_restore_cache fi } |