From 96966626e7ae72084265a6f07b095bf1c212e6be Mon Sep 17 00:00:00 2001
From: adilger <adilger>
Date: Tue, 27 Nov 2007 00:32:57 +0000
Subject: [PATCH] Branch HEAD Don't test swap-on-lustre on TCP, as it can
 livelock allocating receive buffers. b=14033 i=jay

---
 lustre/tests/sanity.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 6b2080f..2cd7334 100644
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -2830,6 +2830,9 @@ test_68() {
 	grep -q llite_lloop /proc/modules
 	[ $? -ne 0 ] && skip "can't find module llite_lloop" && return
 
+	[ -z "`$LCTL list_nids | grep -v tcp`" ] && \
+		skip "can't reliably test swap with TCP" && return
+
 	MEMTOTAL=`meminfo MemTotal`
 	NR_BLOCKS=$((MEMTOTAL>>8))
 	[[ $NR_BLOCKS -le 2048 ]] && NR_BLOCKS=2048
@@ -3143,8 +3146,8 @@ run_test 76 "destroy duplicate inodes in client inode cache ===="
 export ORIG_CSUM=""
 set_checksums()
 {
-	[ "$ORIG_CSUM" ]||ORIG_CSUM=`cat $LPROC/llite/*/checksum_pages|head -n1`
-	for f in $LPROC/llite/*/checksum_pages; do
+	[ "$ORIG_CSUM" ] || ORIG_CSUM=`cat $LPROC/osc/*/checksums | head -n1`
+	for f in $LPROC/osc/*/checksums; do
 		echo $1 >> $f
 	done
 
-- 
1.8.3.1