From c62d7af2e50ec09b73e1a7bf35be6f4a9c4c1b36 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Wed, 18 Feb 2009 16:45:01 +0100 Subject: [PATCH] tests: cleanup ts/cramfs/fsck-endianness Signed-off-by: Karel Zak --- .../fsck-endianness} | 0 tests/{input => ts/cramfs}/cramfs-big.img | Bin tests/{input => ts/cramfs}/cramfs-little.img | Bin .../cramfs/fsck-endianness} | 16 +++++++--------- 4 files changed, 7 insertions(+), 9 deletions(-) rename tests/expected/{ts-cramfs-endianness-fsck => cramfs/fsck-endianness} (100%) rename tests/{input => ts/cramfs}/cramfs-big.img (100%) rename tests/{input => ts/cramfs}/cramfs-little.img (100%) rename tests/{ts-cramfs-endianness-fsck => ts/cramfs/fsck-endianness} (77%) diff --git a/tests/expected/ts-cramfs-endianness-fsck b/tests/expected/cramfs/fsck-endianness similarity index 100% rename from tests/expected/ts-cramfs-endianness-fsck rename to tests/expected/cramfs/fsck-endianness diff --git a/tests/input/cramfs-big.img b/tests/ts/cramfs/cramfs-big.img similarity index 100% rename from tests/input/cramfs-big.img rename to tests/ts/cramfs/cramfs-big.img diff --git a/tests/input/cramfs-little.img b/tests/ts/cramfs/cramfs-little.img similarity index 100% rename from tests/input/cramfs-little.img rename to tests/ts/cramfs/cramfs-little.img diff --git a/tests/ts-cramfs-endianness-fsck b/tests/ts/cramfs/fsck-endianness similarity index 77% rename from tests/ts-cramfs-endianness-fsck rename to tests/ts/cramfs/fsck-endianness index c9d483a9..93ebc7c1 100755 --- a/tests/ts-cramfs-endianness-fsck +++ b/tests/ts/cramfs/fsck-endianness @@ -15,12 +15,10 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # -. ./commands.sh -. ./functions.sh - -TS_COMPONENT="mkfs.cramfs" -TS_DESC="endianness-fsck" +TS_TOPDIR="$(dirname $0)/../.." +TS_DESC="fsck endianness" +. $TS_TOPDIR/functions.sh ts_init "$*" ts_skip_nonroot @@ -29,11 +27,11 @@ set -o pipefail ($TS_CMD_FSCKCRAMFS -x TEST_X_FLAG 2>&1 || true) \ | grep -q "compiled without -x support" && ts_skip "fsck: compiled without -x support" -IMAGE_LITTLE="$TS_INPUTDIR/cramfs-little.img" #Known good little endian image -IMAGE_BIG="$TS_INPUTDIR/cramfs-big.img" #Known good big endian image +IMAGE_LITTLE="$TS_SELF/cramfs-little.img" #Known good little endian image +IMAGE_BIG="$TS_SELF/cramfs-big.img" #Known good big endian image -IMAGE_CREATED="$TS_OUTDIR/cramfs.img" #Image created during the test and compared against the known images. -IMAGE_DATA="$TS_OUTDIR/cramfs-endianness-data" +IMAGE_CREATED="$TS_OUTDIR/${TS_TESTNAME}-cramfs.img" #Image created during the test and compared against the known images. +IMAGE_DATA="$TS_OUTDIR/${TS_TESTNAME}-data" test_image() { local FROM_ENDIANNESS="$1"; shift -- 2.39.5