From 1f0cc0be3202a2d129ca0ba0d01a363bd5bc308a Mon Sep 17 00:00:00 2001
From: grev <grev>
Date: Wed, 19 Sep 2007 22:25:14 +0000
Subject: [PATCH] b=10825 i=Adilger
make ALWAYS_EXCEPT usage more consistent.
---
lustre/tests/sanity-quota.sh | 2 +-
lustre/tests/sanity.sh | 2 +-
lustre/tests/sanityN.sh | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lustre/tests/sanity-quota.sh b/lustre/tests/sanity-quota.sh
index 102f2441bc..d548db42ec 100644
--- a/lustre/tests/sanity-quota.sh
+++ b/lustre/tests/sanity-quota.sh
@@ -17,7 +17,7 @@ SRCDIR=`dirname $0`
export PATH=$PWD/$SRCDIR:$SRCDIR:$PWD/$SRCDIR/../utils:$PATH:/sbin
ONLY=${ONLY:-"$*"}
-ALWAYS_EXCEPT=${ALWAYS_EXCEPT:-""}
+ALWAYS_EXCEPT="$SANITY_QUOTA_EXCEPT"
# UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
case `uname -r` in
diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 96a5ca8cd9..fce524d18b 100644
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -8,7 +8,7 @@ set -e
ONLY=${ONLY:-"$*"}
# bug number for skipped test: 4900 4900 2108 9789 3637 9789 3561 5188/5749 13310 10764
-ALWAYS_EXCEPT=${ALWAYS_EXCEPT:-"27o 27q 42a 42b 42c 42d 45 68 74b 75"}
+ALWAYS_EXCEPT=" 27o 27q 42a 42b 42c 42d 45 68 74b 75 $SANITY_EXCEPT"
# bug number for skipped test: 2108 9789 3637 9789 3561 5188/5749 1443
#ALWAYS_EXCEPT=${ALWAYS_EXCEPT:-"27m 42a 42b 42c 42d 45 68 76"}
# UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
diff --git a/lustre/tests/sanityN.sh b/lustre/tests/sanityN.sh
index 56982f3765..8ad81748a9 100644
--- a/lustre/tests/sanityN.sh
+++ b/lustre/tests/sanityN.sh
@@ -4,7 +4,7 @@ set -e
ONLY=${ONLY:-"$*"}
# bug number for skipped test: 3192 9977
-ALWAYS_EXCEPT=${ALWAYS_EXCEPT:-"14b 28"}
+ALWAYS_EXCEPT="14b 28 $SANITYN_EXCEPT"
# UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
[ "$SLOW" = "no" ] && EXCEPT="$EXCEPT 16"
--
GitLab