From: Ruediger Meier Date: Thu, 15 Jun 2017 00:40:57 +0000 (+0200) Subject: tests: split partx in root and non-root X-Git-Tag: v2.31-rc1~293^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fd3c28059432620fc7a893fe3b305ce1284810b3;p=thirdparty%2Futil-linux.git tests: split partx in root and non-root Signed-off-by: Ruediger Meier --- diff --git a/tests/expected/partx/partx-bsd b/tests/expected/partx/partx-image-bsd similarity index 100% rename from tests/expected/partx/partx-bsd rename to tests/expected/partx/partx-image-bsd diff --git a/tests/expected/partx/partx-dos+bsd b/tests/expected/partx/partx-image-dos+bsd similarity index 100% rename from tests/expected/partx/partx-dos+bsd rename to tests/expected/partx/partx-image-dos+bsd diff --git a/tests/expected/partx/partx-gpt b/tests/expected/partx/partx-image-gpt similarity index 100% rename from tests/expected/partx/partx-gpt rename to tests/expected/partx/partx-image-gpt diff --git a/tests/expected/partx/partx-sgi b/tests/expected/partx/partx-image-sgi similarity index 100% rename from tests/expected/partx/partx-sgi rename to tests/expected/partx/partx-image-sgi diff --git a/tests/expected/partx/partx-sun b/tests/expected/partx/partx-image-sun similarity index 100% rename from tests/expected/partx/partx-sun rename to tests/expected/partx/partx-image-sun diff --git a/tests/ts/partx/partx b/tests/ts/partx/partx index 7f629218ab..b21dc44efa 100755 --- a/tests/ts/partx/partx +++ b/tests/ts/partx/partx @@ -18,7 +18,6 @@ TS_TOPDIR="${0%/*}/../.." TS_DESC="partitions probing" -TS_IMGDIR="$TS_TOPDIR/ts/blkid/images-pt" PARTS=3 . $TS_TOPDIR/functions.sh @@ -29,7 +28,6 @@ ts_check_test_command "$TS_CMD_ADDPART" ts_check_test_command "$TS_CMD_DELPART" ts_skip_nonroot -ts_check_prog "xz" shopt -s nullglob @@ -49,20 +47,6 @@ function check_partition_count 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 ts_scsi_debug_init dev_size_mb=50 diff --git a/tests/ts/partx/partx-image b/tests/ts/partx/partx-image new file mode 100755 index 0000000000..73c7ba155d --- /dev/null +++ b/tests/ts/partx/partx-image @@ -0,0 +1,43 @@ +#!/bin/bash + +# +# Copyright (C) 2010 Davidlohr Bueso +# +# 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