From: scjody <scjody>
Date: Thu, 25 Oct 2007 18:48:15 +0000 (+0000)
Subject: Branch b1_6
X-Git-Tag: v1_8_0_110~1061
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=9634e4e2ff0418d615775c79c98fb188ae8cc16f;p=fs%2Flustre-release.git

Branch b1_6

Moving bug 12652 EXCEPT to the correct test.
---

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 8932d82..d5f3559 100644
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -7,8 +7,8 @@
 set -e
 
 ONLY=${ONLY:-"$*"}
-# bug number for skipped test: 12652 4900 4900 2108 9789 3637 9789 3561 13310 10764
-ALWAYS_EXCEPT=${ALWAYS_EXCEPT:-"14c  27o  27q  42a  42b  42c  42d  45   74b   75"}
+# bug number for skipped test: 4900 4900 2108 9789 3637 9789 3561 13310 10764
+ALWAYS_EXCEPT=${ALWAYS_EXCEPT:-"27o  27q  42a  42b  42c  42d  45   74b   75"}
 # UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
 
 [ "$SLOW" = "no" ] && EXCEPT="$EXCEPT 24o 27m 36f 36g 51b 51c 60c 63 64b 68 71 73 101 103 115 120g"
diff --git a/lustre/tests/sanityN.sh b/lustre/tests/sanityN.sh
index 57277c8..975a88b 100644
--- a/lustre/tests/sanityN.sh
+++ b/lustre/tests/sanityN.sh
@@ -3,8 +3,8 @@
 set -e
 
 ONLY=${ONLY:-"$*"}
-# bug number for skipped test:  3192
-ALWAYS_EXCEPT="14b $SANITYN_EXCEPT"
+# bug number for skipped test:  3192 12652
+ALWAYS_EXCEPT="                 14b  14c   $SANITYN_EXCEPT"
 # UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
 
 [ "$SLOW" = "no" ] && EXCEPT="$EXCEPT 16"