Move ziltest.sh to the ZTS framework

The ziltest.sh script is a test case designed to verify the correct functioning of the ZIL. For historical reasons it was never added to the test suite and was always run independantly. This change rectifies that. The existing ziltest.sh has been translated in to `slog_015_pos.ksh` and added to the existing slog test cases. Reviewed-by: Don Brady <[email protected]> Reviewed-by: Chunwei Chen <[email protected]> Reviewed-by: George Melikov <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Closes #5758
openzfs · Feb 9, 2017 · b0eac56 · b0eac56
1 parent ea7e86d
commit b0eac56
Show file tree

Hide file tree

Showing 8 changed files with 207 additions and 318 deletions.
diff --git a/TEST b/TEST
@@ -13,10 +13,6 @@
 #TEST_ZTEST_DIR="/var/tmp/"
 #TEST_ZTEST_OPTIONS="-V"
 
-### ziltest
-#TEST_ZILTEST_SKIP="yes"
-#TEST_ZILTEST_OPTIONS=""
-
 ### zconfig
 #TEST_ZCONFIG_SKIP="yes"
 TEST_ZCONFIG_OPTIONS="-c -s10"
@@ -79,12 +75,8 @@ Amazon*)
 CentOS-7*)
     # ZFS enabled xfstests fails to build
     TEST_XFSTESTS_SKIP="yes"
-    # Sporadic VERIFY(!zilog_is_dirty(zilog)) failed
-    TEST_ZILTEST_SKIP="yes"
     ;;
 CentOS-6*)
-    # Sporadic VERIFY(!zilog_is_dirty(zilog)) failed
-    TEST_ZILTEST_SKIP="yes"
     ;;
 Debian*)
     ;;

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
@@ -6,7 +6,6 @@ pkgdatadir = $(datadir)/@PACKAGE@
 dist_pkgdata_SCRIPTS = \
 	$(top_builddir)/scripts/common.sh \
 	$(top_srcdir)/scripts/zconfig.sh \
-	$(top_srcdir)/scripts/ziltest.sh \
 	$(top_srcdir)/scripts/zimport.sh \
 	$(top_srcdir)/scripts/zfs.sh \
 	$(top_srcdir)/scripts/zfs-tests.sh \

diff --git a/scripts/ziltest.sh b/scripts/ziltest.sh
diff --git a/tests/runfiles/linux.run b/tests/runfiles/linux.run
@@ -585,7 +585,7 @@ tests = ['scrub_mirror_001_pos', 'scrub_mirror_002_pos',
 [tests/functional/slog]
 tests = ['slog_001_pos', 'slog_002_pos', 'slog_003_pos', 'slog_004_pos',
     'slog_005_pos', 'slog_006_pos', 'slog_007_pos', 'slog_008_neg',
-    'slog_009_neg', 'slog_010_neg', 'slog_011_neg']
+    'slog_009_neg', 'slog_010_neg', 'slog_011_neg', 'slog_015_pos']
 
 # DISABLED:
 # clone_001_pos - https://github.com/zfsonlinux/zfs/issues/3484

diff --git a/tests/zfs-tests/tests/functional/slog/Makefile.am b/tests/zfs-tests/tests/functional/slog/Makefile.am
@@ -17,4 +17,5 @@ dist_pkgdata_SCRIPTS = \
 	slog_011_neg.ksh \
 	slog_012_neg.ksh \
 	slog_013_pos.ksh \
-	slog_014_pos.ksh
+	slog_014_pos.ksh \
+	slog_015_pos.ksh
diff --git a/tests/zfs-tests/tests/functional/slog/slog.cfg b/tests/zfs-tests/tests/functional/slog/slog.cfg
@@ -30,8 +30,8 @@
 
 export SIZE=64M
 
-export VDIR=/disk-slog
-export VDIR2=/disk2-slog
+export VDIR=$TEST_BASE_DIR/disk-slog
+export VDIR2=$TEST_BASE_DIR/disk2-slog
 
 export VDEV="$VDIR/a $VDIR/b $VDIR/c"
 export SDEV="$VDIR/d"

diff --git a/tests/zfs-tests/tests/functional/slog/slog.kshlib b/tests/zfs-tests/tests/functional/slog/slog.kshlib
@@ -39,6 +39,7 @@ function cleanup
 	if datasetexists $TESTPOOL2 ; then
 		log_must $ZPOOL destroy -f $TESTPOOL2
 	fi
+	rm -rf $TESTDIR
 }
 
 #
-Original file line number
+Diff line change
@@ Expand Up / @@ -39,6 +39,7 @@ function cleanup @@
     	if datasetexists $TESTPOOL2 ; then
     		log_must $ZPOOL destroy -f $TESTPOOL2
     	fi
+    	rm -rf $TESTDIR
     }
     #
@@ Expand Down @@