From: Eric Sandeen <sandeen@sandeen.net>
Date: Wed, 9 Jan 2013 16:13:26 +0000 (-0600)
Subject: xfstests: move _filter_ln to common.filter
X-Git-Tag: v2022.05.01~3552
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=26966520cc82ce425aa33bcb3652c6deeed86583;p=xfstests-dev.git

xfstests: move _filter_ln to common.filter

Move test 103's _filter_ln to common.filter and make
it more generic (not depending on 103's pathnames).

TBH I've lost my children's treasury of ln failure
messages, so I'm not sure this catches all variants;
it's hard to work backwards from the existing sed script
to what the various outputs were.  This works for me
but might need more tweaking on other systems.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Ben Myers <bpm@sgi.com>
---

diff --git a/103 b/103
index e383991b..a3907392 100755
--- a/103
+++ b/103
@@ -54,13 +54,6 @@ _create_scratch()
 	fi
 }
 
-_filter_ln()
-{
-    sed -e "s,SCRATCH_MNT/nosymlink/target - Operation not permitted,ln: creating symbolic link \`SCRATCH_MNT/nosymlink/target\' to \`SCRATCH_MNT/nosymlink/source\': Operation not permitted,g" \
-        -e "/SCRATCH_MNT.*to.*SCRATCH_MNT/! s,: Operation not permitted, to \`SCRATCH_MNT/nosymlink/source\': Operation not permitted,g" \
-	-e "s,failed to create,creating,"
-}
-
 _filter_noymlinks_flag()
 {
 	_test_inode_flag nosymlinks $SCRATCH_MNT/nosymlink
diff --git a/103.out b/103.out
index 45c0aa89..f939bcd6 100644
--- a/103.out
+++ b/103.out
@@ -4,7 +4,7 @@ QA output created by 103
 *** testing nosymlinks directories
 *** setting nosymlinks bit
 --n-- SCRATCH_MNT/nosymlink
-ln: creating symbolic link `SCRATCH_MNT/nosymlink/target' to `SCRATCH_MNT/nosymlink/source': Operation not permitted
+ln: creating symbolic link `SCRATCH_MNT/nosymlink/target': Operation not permitted
 *** 1st listing...
 SCRATCH_MNT
 SCRATCH_MNT/nosymlink
diff --git a/common.filter b/common.filter
index f0f60763..9e4c90c5 100644
--- a/common.filter
+++ b/common.filter
@@ -229,5 +229,12 @@ _filter_spaces()
        sed -e 's/ [ ]*/ /g'
 }
 
+# Account for different "ln" failure messages
+_filter_ln()
+{
+	sed -e "s,\(creating symbolic link .*\) to .*: ,\1," \
+	    -e "s,failed to create,creating,"
+}
+
 # make sure this script returns success
 /bin/true