tests: split partx in root and non-root
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
This commit is contained in:
parent
3a951379a7
commit
fd3c280594
|
@ -18,7 +18,6 @@
|
||||||
|
|
||||||
TS_TOPDIR="${0%/*}/../.."
|
TS_TOPDIR="${0%/*}/../.."
|
||||||
TS_DESC="partitions probing"
|
TS_DESC="partitions probing"
|
||||||
TS_IMGDIR="$TS_TOPDIR/ts/blkid/images-pt"
|
|
||||||
PARTS=3
|
PARTS=3
|
||||||
|
|
||||||
. $TS_TOPDIR/functions.sh
|
. $TS_TOPDIR/functions.sh
|
||||||
|
@ -29,7 +28,6 @@ ts_check_test_command "$TS_CMD_ADDPART"
|
||||||
ts_check_test_command "$TS_CMD_DELPART"
|
ts_check_test_command "$TS_CMD_DELPART"
|
||||||
|
|
||||||
ts_skip_nonroot
|
ts_skip_nonroot
|
||||||
ts_check_prog "xz"
|
|
||||||
|
|
||||||
shopt -s nullglob
|
shopt -s nullglob
|
||||||
|
|
||||||
|
@ -49,20 +47,6 @@ function check_partition_count
|
||||||
return 1
|
return 1
|
||||||
}
|
}
|
||||||
|
|
||||||
mkdir -p $TS_OUTDIR/images-pt
|
|
||||||
for img in $TS_IMGDIR/*.img.xz; do
|
|
||||||
name=$(basename $img .img.xz)
|
|
||||||
outimg=$TS_OUTDIR/images-pt/${name}.img
|
|
||||||
|
|
||||||
ts_init_subtest $name
|
|
||||||
{
|
|
||||||
xz -dc $img > $outimg &&
|
|
||||||
$TS_CMD_PARTX $outimg ||
|
|
||||||
echo "failed: $?"
|
|
||||||
} >$TS_OUTPUT 2>&1
|
|
||||||
ts_finalize_subtest
|
|
||||||
done
|
|
||||||
|
|
||||||
# set global variable TS_DEVICE
|
# set global variable TS_DEVICE
|
||||||
ts_scsi_debug_init dev_size_mb=50
|
ts_scsi_debug_init dev_size_mb=50
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,43 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
#
|
||||||
|
# Copyright (C) 2010 Davidlohr Bueso <dave@gnu.org>
|
||||||
|
#
|
||||||
|
# This file is part of util-linux.
|
||||||
|
#
|
||||||
|
# This file is free software; you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation; either version 2 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This file is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
|
||||||
|
TS_TOPDIR="${0%/*}/../.."
|
||||||
|
TS_DESC="show images"
|
||||||
|
TS_IMGDIR="$TS_TOPDIR/ts/blkid/images-pt"
|
||||||
|
|
||||||
|
. $TS_TOPDIR/functions.sh
|
||||||
|
ts_init "$*"
|
||||||
|
|
||||||
|
ts_check_test_command "$TS_CMD_PARTX"
|
||||||
|
ts_check_prog "xz"
|
||||||
|
|
||||||
|
mkdir -p $TS_OUTDIR/images-pt
|
||||||
|
for img in $TS_IMGDIR/*.img.xz; do
|
||||||
|
name=$(basename $img .img.xz)
|
||||||
|
outimg=$TS_OUTDIR/images-pt/${name}.img
|
||||||
|
|
||||||
|
ts_init_subtest $name
|
||||||
|
{
|
||||||
|
xz -dc $img > $outimg &&
|
||||||
|
$TS_CMD_PARTX $outimg ||
|
||||||
|
echo "failed: $?"
|
||||||
|
} >$TS_OUTPUT 2>&1
|
||||||
|
ts_finalize_subtest
|
||||||
|
done
|
||||||
|
|
||||||
|
ts_finalize
|
Loading…
Reference in New Issue