import quincy beta 17.1.0

[ceph.git] / ceph / qa / run_xfstests_qemu.sh

diff --git a/ceph/qa/run_xfstests_qemu.sh b/ceph/qa/run_xfstests_qemu.sh
index 40300cea6fef3b2df632eb08039a603565a5019b..4849a6c1ef57e88b99814a0e6cc865f14370a7be 100644 (file)
--- a/ceph/qa/run_xfstests_qemu.sh
+++ b/ceph/qa/run_xfstests_qemu.sh
@@ -13,15 +13,28 @@ SCRIPT="run_xfstests-obsolete.sh"
 cd "${TESTDIR}"
 
 wget -O "${SCRIPT}" "${URL_BASE}/${SCRIPT}"
-chmod +x "${SCRIPT}"
+# mark executable only if the file isn't empty since ./"${SCRIPT}"
+# on an empty file would succeed
+if [[ -s "${SCRIPT}" ]]; then
+    chmod +x "${SCRIPT}"
+fi
+
+TEST_DEV="/dev/vdb"
+if [[ ! -b "${TEST_DEV}" ]]; then
+    TEST_DEV="/dev/sdb"
+fi
+SCRATCH_DEV="/dev/vdc"
+if [[ ! -b "${SCRATCH_DEV}" ]]; then
+    SCRATCH_DEV="/dev/sdc"
+fi
 
 # tests excluded fail in the current testing vm regardless of whether
 # rbd is used
 
-./"${SCRIPT}" -c 1 -f xfs -t /dev/vdb -s /dev/vdc \
+./"${SCRIPT}" -c 1 -f xfs -t "${TEST_DEV}" -s "${SCRATCH_DEV}" \
     1-7 9-17 19-26 28-49 51-61 63 66-67 69-79 83 85-105 108-110 112-135 \
     137-170 174-191 193-204 206-217 220-227 230-231 233 235-241 243-249 \
-    251-262 264-278 281-286 288-289
+    252-259 261-262 264-278 281-286 289
 STATUS=$?
 
 rm -f "${SCRIPT}"