From 1303d95963dd61a04d4f0bdad0a814be72ddb446 Mon Sep 17 00:00:00 2001
From: grev <grev>
Date: Fri, 14 Sep 2007 12:15:17 +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 f04644a7ec..9a99e91b10 100644
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -1951,7 +1951,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"
@@ -1974,7 +1974,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"
@@ -1998,11 +1998,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 54da87bf5f..6d30100c57 100644
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -1075,3 +1075,8 @@ remote_ost ()
{
[ $(grep -c obdfilter $LPROC/devices) -eq 0 ]
}
+
+is_patchless ()
+{
+ grep -q patchless $LPROC/version
+}
--
GitLab