From ff7ddd7d87a8426d7983bd27ba63f9f932c1ecb5 Mon Sep 17 00:00:00 2001
From: zab <zab>
Date: Sat, 20 Mar 2004 00:58:02 +0000
Subject: [PATCH] - don't try and import links or files that aren't globally
 readable in   test 99.  Doing so make's cvs 1.11.1p1 exit(1).  with this
 sanity   passes on x86-64 again.

---
 lustre/tests/sanity.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index ca53e60..b5d59bc 100644
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -1850,7 +1850,12 @@ run_test 99a "cvs init ========================================="
 test_99b() {
 	[ ! -d $DIR/d99cvsroot ] && test_99a
 	cd /etc/init.d
-	$RUNAS cvs -d $DIR/d99cvsroot import -m "nomesg" d99reposname vtag rtag
+	# some versions of cvs import exit(1) when asked to import links or
+	# files they can't read.  ignore those files.
+	TOIGNORE=$(find . -type l -printf '-I %f\n' -o \
+			! -perm +4 -printf '-I %f\n')
+	$RUNAS cvs -d $DIR/d99cvsroot import -m "nomesg" $TOIGNORE \
+		d99reposname vtag rtag
 }
 run_test 99b "cvs import ======================================="
 
-- 
1.8.3.1