LU-2874 tests: mark slow sync zfs tests as EXCEPT_SLOW

For tests that take a very long time on ZFS but not on ldiskfs, place
them in EXCEPT_SLOW when running on zfs.

Signed-off-by: Nathaniel Clark <nathaniel.l.clark@intel.com>
Change-Id: I52193d9a1c51e1276a5ac86c46f32e5ba5dd6299
Reviewed-on: http://review.whamcloud.com/5553
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/lustre/tests/replay-ost-single.sh b/lustre/tests/replay-ost-single.sh
index 8babef8..5f61e0d 100755 (executable)
--- a/lustre/tests/replay-ost-single.sh
+++ b/lustre/tests/replay-ost-single.sh
@@ -26,9 +26,12 @@ ALWAYS_EXCEPT="$REPLAY_OST_SINGLE_EXCEPT"
 #                                      
 [ "$SLOW" = "no" ] && EXCEPT_SLOW="5"
 
-[ $(facet_fstype $SINGLEMDS) = "zfs" ] &&
+if [ $(facet_fstype $SINGLEMDS) = "zfs" ]; then
 # bug number for skipped test:      LU-2285
        ALWAYS_EXCEPT="$ALWAYS_EXCEPT 3"
+# bug number for slowed tests:                          LU-2874
+       [ "$SLOW" = "no" ] && EXCEPT_SLOW="$EXCEPT_SLOW 8a"
+fi
 
 build_test_filter
 

diff --git a/lustre/tests/sanity-quota.sh b/lustre/tests/sanity-quota.sh
index 1029b52..7fdeedb 100644 (file)
--- a/lustre/tests/sanity-quota.sh
+++ b/lustre/tests/sanity-quota.sh
@@ -49,11 +49,14 @@ if [ $(facet_fstype $SINGLEMDS) == ldiskfs ] && \
        skip "e2fsprogs doesn't support quota" && exit 0
 fi
 
-[ $(facet_fstype $SINGLEMDS) = "zfs" ] &&
-# bug number for skipped test:        LU-2836 LU-2837 LU-2059
+if [ $(facet_fstype $SINGLEMDS) = "zfs" ]; then
+# bug number for skipped test:        LU-2836 LU-2836 LU-2059
        ALWAYS_EXCEPT="$ALWAYS_EXCEPT 3       6       7d"
+# bug number:     LU-2887
+       ZFS_SLOW="12a"
+fi
 
-[ "$SLOW" = "no" ] && EXCEPT_SLOW="9 18 21"
+[ "$SLOW" = "no" ] && EXCEPT_SLOW="$ZFS_SLOW 9 18 21"
 
 QUOTALOG=${TESTSUITELOG:-$TMP/$(basename $0 .sh).log}