[Ocfs2-test-devel] [PATCH 2/2] Ocfs2-test: Verification after destruction of reflink volume should be standalone.

[Tristan Ye]

Verification after reflink_test's destructive test should be isolated from
other testcases since it does not need a fresh mkfs before test.

Signed-off-by: Tristan Ye <tristan.ye at oracle.com>
---
 programs/reflink_tests/reflink_test_run.sh |   27 +++++++++++++++------------
 1 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/programs/reflink_tests/reflink_test_run.sh b/programs/reflink_tests/reflink_test_run.sh
index 0c88f4d..3a35701 100755
--- a/programs/reflink_tests/reflink_test_run.sh
+++ b/programs/reflink_tests/reflink_test_run.sh
@@ -398,6 +398,21 @@ for #${j} reflink and copy"
 
 function f_runtest()
 {
+	if [ -n "${VERI_TEST}" ];then
+	((TEST_NO++))
+	f_LogRunMsg ${RUN_LOG_FILE} "[${TEST_NO}] Verify Test After Desctruction :"
+	f_mount ${LOG_FILE} ${DEVICE} ${MOUNT_POINT} ocfs2 ${MOUNT_OPTS}
+	RET=$?
+	f_exit_or_not ${RET}
+	f_LogMsg ${LOG_FILE} "[${TEST_NO}] Verify Test After Desctruction, CMD:${SUDO} \
+${REFLINK_TEST_BIN} -i 1 -n 10 -p 10 -l 1638400 -d ${DEVICE} -w ${WORK_PLACE} -v ${VERI_LOG} "
+	${SUDO} ${REFLINK_TEST_BIN} -i 1 -n 10 -p 10 -l 1638400 -d ${DEVICE} -w \
+${WORK_PLACE} -v ${VERI_LOG} >>${LOG_FILE} 2>&1
+        RET=$?
+        f_echo_status ${RET} | tee -a ${RUN_LOG_FILE}
+	exit ${RET}
+	fi
+
 	f_LogRunMsg ${RUN_LOG_FILE} "[*] Mkfs device ${DEVICE}:"
 	f_mkfs ${LOG_FILE} ${BLOCKSIZE} ${CLUSTERSIZE} ${LABELNAME} ${SLOTS} \
 ${DEVICE} "refcount,xattr" ${JOURNALSIZE} ${BLOCKS}
@@ -414,18 +429,6 @@ ${DEVICE} "refcount,xattr" ${JOURNALSIZE} ${BLOCKS}
 	WORK_PLACE=${MOUNT_POINT}/${WORK_PLACE_DIRENT}
 	${MKDIR_BIN} -p ${WORK_PLACE}
 
-	if [ -n "${VERI_TEST}" ];then
-	((TEST_NO++))
-	f_LogRunMsg ${RUN_LOG_FILE} "[${TEST_NO}] Verify Test After Desctruction :"
-	f_LogMsg ${LOG_FILE} "[${TEST_NO}] Verify Test After Desctruction, CMD:${SUDO} \
-${REFLINK_TEST_BIN} -i 1 -n 10 -p 10 -l 1638400 -d ${DEVICE} -w ${WORK_PLACE} -v ${VERI_LOG} "
-	${SUDO} ${REFLINK_TEST_BIN} -i 1 -n 10 -p 10 -l 1638400 -d ${DEVICE} -w \
-${WORK_PLACE} -v ${VERI_LOG} >>${LOG_FILE} 2>&1
-        RET=$?
-        f_echo_status ${RET} | tee -a ${RUN_LOG_FILE}
-	exit ${RET}
-	fi
-
 	if [ -n "${DSCV_TEST}" ];then
 	((TEST_NO++))
 	f_LogRunMsg ${RUN_LOG_FILE} "[${TEST_NO}] Destructive Test For DirectIO:"
-- 
1.5.5