From fc214b0d115e14aeb5224df72ae58d475ca15bf2 Mon Sep 17 00:00:00 2001
From: grev <grev>
Date: Fri, 14 Sep 2007 12:22:21 +0000
Subject: [PATCH] b=12460 i=Adilger

Skip "cd ." part for patchless.
---
 lustre/tests/sanity.sh         | 8 ++++----
 lustre/tests/test-framework.sh | 5 +++++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index a1d5103..f4afe9f 100644
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -2062,7 +2062,7 @@ test_48b() { # bug 2399
 	fi
 	ls . > /dev/null && error "'ls .' worked after removing cwd"
 	ls .. > /dev/null || error "'ls ..' failed after removing cwd"
-	cd . && error "'cd .' worked after removing cwd"
+	is_patchless || ( cd . && error "'cd .' worked after removing cwd" )
 	mkdir . && error "'mkdir .' worked after removing cwd"
 	rmdir . && error "'rmdir .' worked after removing cwd"
 	ln -s . foo && error "'ln -s .' worked after removing cwd"
@@ -2085,7 +2085,7 @@ test_48c() { # bug 2350
 	fi
 	$TRACE ls . && error "'ls .' worked after removing cwd"
 	$TRACE ls .. || error "'ls ..' failed after removing cwd"
-	$TRACE cd . && error "'cd .' worked after removing cwd"
+	is_patchless || ( $TRACE cd . && error "'cd .' worked after removing cwd" )
 	$TRACE mkdir . && error "'mkdir .' worked after removing cwd"
 	$TRACE rmdir . && error "'rmdir .' worked after removing cwd"
 	$TRACE ln -s . foo && error "'ln -s .' worked after removing cwd"
@@ -2109,11 +2109,11 @@ test_48d() { # bug 2350
 	fi
 	$TRACE ls . && error "'ls .' worked after removing parent"
 	$TRACE ls .. && error "'ls ..' worked after removing parent"
-	$TRACE cd . && error "'cd .' worked after recreate parent"
+	is_patchless || ( $TRACE cd . && error "'cd .' worked after recreate parent" )
 	$TRACE mkdir . && error "'mkdir .' worked after removing parent"
 	$TRACE rmdir . && error "'rmdir .' worked after removing parent"
 	$TRACE ln -s . foo && error "'ln -s .' worked after removing parent"
-	$TRACE cd .. && error "'cd ..' worked after removing parent" || true
+	is_patchless || ( $TRACE cd .. && error "'cd ..' worked after removing parent" || true )
 }
 run_test 48d "Access removed parent subdir (should return errors)"
 
diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index f0a460e..36be2e3 100644
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -1207,3 +1207,8 @@ remote_ost ()
 {
     [ $(grep -c obdfilter $LPROC/devices) -eq 0 ]
 }
+
+is_patchless ()
+{
+    grep -q patchless $LPROC/version
+}
-- 
1.8.3.1