diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2021-05-20 16:11:47 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2021-05-20 16:13:03 -0400 |
| commit | 1a0e09960d0b25c1befb134d26d35f9c3eb86cb9 (patch) | |
| tree | c4c897c5f74a279423ef8edf41c0348053ff6c6c | |
| parent | 246ddef1ca1fae356c3abe77e018a0264d9bec5a (diff) | |
Move xfstests results to ktest-out/xfstests-results
This is to facilitate having multiple ktest instances running at the
same time.
Also update btrfs.ktest
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
| -rw-r--r-- | tests/btrfs.ktest | 10 | ||||
| -rw-r--r-- | tests/xfstests.sh | 34 |
2 files changed, 19 insertions, 25 deletions
diff --git a/tests/btrfs.ktest b/tests/btrfs.ktest index b6398b4..d628bcb 100644 --- a/tests/btrfs.ktest +++ b/tests/btrfs.ktest @@ -5,12 +5,10 @@ require-lib test-libs.sh require-kernel-config BTRFS_FS require-kernel-config QUOTA -config-scratch-devs 4G -config-scratch-devs 4G -config-timeout $(stress_timeout) +require-lib xfstests.sh -test_multi_devs() +run_tests() { - mkfs.btrfs /dev/sdb /dev/sdc - + run_xfstests btrfs "$@" } + diff --git a/tests/xfstests.sh b/tests/xfstests.sh index 2ccb578..2cd9940 100644 --- a/tests/xfstests.sh +++ b/tests/xfstests.sh @@ -18,8 +18,8 @@ config-timeout 7200 hook_make_xfstests() { - useradd -m fsgqa - useradd -g fsgqa 123456-fsgqa + useradd -m fsgqa || true + useradd -g fsgqa 123456-fsgqa || true mkdir -p /mnt/test /mnt/scratch @@ -35,27 +35,23 @@ list_tests() run_xfstests() { - TEST_DEV=/dev/sdb - TEST_DIR=/mnt/test - SCRATCH_DEV=/dev/sdc - SCRATCH_MNT=/mnt/scratch - LOGWRITES_DEV=/dev/sdd - FSTYP="$1" + export FSTYP="$1" shift - rm /ktest/tests/xfstests/local.config - echo "TEST_DEV=$TEST_DEV" >> /ktest/tests/xfstests/local.config - echo TEST_DIR=$TEST_DIR >> /ktest/tests/xfstests/local.config - echo SCRATCH_DEV=$SCRATCH_DEV >> /ktest/tests/xfstests/local.config - echo SCRATCH_MNT=$SCRATCH_MNT >> /ktest/tests/xfstests/local.config - echo LOGWRITES_DEV=$LOGWRITES_DEV >> /ktest/tests/xfstests/local.config - echo FSTYP=$FSTYP >> /ktest/tests/xfstests/local.config - echo LOGGER_PROG=true >> /ktest/tests/xfstests/local.config + cat << EOF > /ktest/tests/xfstests/local.config +TEST_DEV=/dev/sdb +TEST_DIR=/mnt/test +SCRATCH_DEV=/dev/sdc +SCRATCH_MNT=/mnt/scratch +LOGWRITES_DEV=/dev/sdd +RESULT_BASE=/ktest-out/xfstests-results +LOGGER_PROG=true +EOF - wipefs -af $TEST_DEV - mkfs.$FSTYP -q $TEST_DEV + wipefs -af /dev/sdb + mkfs.$FSTYP -q /dev/sdb - mount $TEST_DEV $TEST_DIR + mount /dev/sdb /mnt/test cd "$ktest_dir/tests/xfstests" |