generic: fix missed FSX_AVOID parameter

PATCH New Zorro Lang 1 participant 1 message Jul 2, 2019

Share & tools

Zorro Lang

author

2019-07-02 08:45 UTC #0 lore raw

PATCH 1/1 generic: fix missed FSX_AVOID parameter

When I try to avoid copy_file_range operation from fsx, I set FSX_AVOID="-E", but it doesn't work on generic/455, and generic/127 doesn't show $FSX_AVOID when it fails.

Signed-off-by Zorro Lang <[email protected]>

---
 tests/generic/127 | 8 ++++----
 tests/generic/455 | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

tests/generic/127 +4 -4

index dedd8bbf..222e0315 100755
@@ -37,7 +37,7 @@ _fsx_lite_nommap()
     dd if=/dev/zero of=$TEST_DIR/fsx_lite_nommap bs=${FSX_FILE_SIZE} count=1 > /dev/null 2>&1
     if ! ltp/fsx $FSX_ARGS -L -R -W $FSX_AVOID $TEST_DIR/fsx_lite_nommap > $tmp.output 2>&1
     then
-        echo "ltp/fsx $FSX_ARGS -L -R -W $TEST_DIR/fsx_lite_nommap"
+        echo "ltp/fsx $FSX_ARGS -L -R -W $FSX_AVOID $TEST_DIR/fsx_lite_nommap"
         cat $tmp.output
         return 1
     fi

@@ -51,7 +51,7 @@ _fsx_lite_mmap()
     dd if=/dev/zero of=$TEST_DIR/fsx_lite_mmap bs=${FSX_FILE_SIZE} count=1 > /dev/null 2>&1
     if ! ltp/fsx $FSX_ARGS -L $FSX_AVOID $TEST_DIR/fsx_lite_mmap > $tmp.output 2>&1
     then
-    	echo "ltp/fsx $FSX_ARGS -L fsx_lite_mmap"
+	echo "ltp/fsx $FSX_ARGS -L $FSX_AVOID $TEST_DIR/fsx_lite_mmap"
 	cat $tmp.output
 	return 1
     fi

@@ -64,7 +64,7 @@ _fsx_std_nommap()
     echo "=== FSX Standard Mode, No Memory Mapping ==="
     if ! ltp/fsx $FSX_ARGS -R -W $FSX_AVOID $TEST_DIR/fsx_std_nommap > $tmp.output 2>&1
     then
-        echo "ltp/fsx $FSX_ARGS -R -W fsx_std_nommap"
+        echo "ltp/fsx $FSX_ARGS -R -W $FSX_AVOID $TEST_DIR/fsx_std_nommap"
         cat $tmp.output
         return 1
     fi

@@ -77,7 +77,7 @@ _fsx_std_mmap()
     echo "=== FSX Standard Mode, Memory Mapping ==="
     if ! ltp/fsx $FSX_ARGS $FSX_AVOID $TEST_DIR/fsx_std_mmap > $tmp.output 2>&1
     then
-    	echo "ltp/fsx $FSX_ARGS fsx_std_mmap"
+	echo "ltp/fsx $FSX_ARGS $FSX_AVOID $TEST_DIR/fsx_std_mmap"
 	cat $tmp.output
 	return 1
     fi

tests/generic/455 +1 -1

index 05621220..404c603b 100755
@@ -66,7 +66,7 @@ _log_writes_mount -o discard
 
 NUM_FILES=4
 NUM_OPS=200
-FSX_OPTS="-N $NUM_OPS -d -P $SANITY_DIR -i $LOGWRITES_DMDEV"
+FSX_OPTS="-N $NUM_OPS -d -P $SANITY_DIR -i $LOGWRITES_DMDEV $FSX_AVOID"
 # Set random seeds for fsx runs (0 for timestamp + pid)
 # When test failure is detected, check the seed values printed
 # by fsx processes to $seqres.full and set them in this array

Signature · 1 line

2.17.2