]> git.apps.os.sepia.ceph.com Git - xfstests-dev.git/commitdiff
xfstests: ENOSPC Punch Hole: Move su routines in 123 to common.rc
authorAllison Henderson <achender@linux.vnet.ibm.com>
Tue, 28 Jun 2011 14:45:00 +0000 (14:45 +0000)
committerAlex Elder <aelder@sgi.com>
Wed, 20 Jul 2011 23:22:06 +0000 (18:22 -0500)
This patch moves the su routines in test 123 to common.rc so that
they can also be used in the new test 256

Signed-off-by: Allison Henderson <achender@linux.vnet.ibm.com>
Signed-off-by: Alex Elder <aelder@sgi.com>
123
common.rc

diff --git a/123 b/123
index 27c1e660dc3dbd25ffdbebd24deb151b31f97a1d..ee1194dac1015591d0e1bf8b8833b61d5316c935 100755 (executable)
--- a/123
+++ b/123
@@ -42,30 +42,6 @@ _cleanup()
     _cleanup_testdir
 }
 
-
-_filter_user_do()
-{
-        perl -ne "
-s,.*Permission\sdenied.*,Permission denied,;
-s,.*no\saccess\sto\stty.*,,;
-s,.*no\sjob\scontrol\sin\sthis\sshell.*,,;
-s,^\s*$,,;
-        print;"
-}
-
-
-
-
-_user_do()
-{
-    if [ "$HOSTOS" == "IRIX" ]
-       then
-       echo $1 | /bin/bash "su $qa_user 2>&1" | _filter_user_do
-    else
-       echo $1 | su $qa_user 2>&1 | _filter_user_do
-    fi
-}
-
 # get standard environment, filters and checks
 . ./common.rc
 . ./common.filter
index 680631d7e595dd23388f9b786e9a5d173f9de64f..cb23a02f42a3e3f233044ecc51d7cecee39d3c3c 100644 (file)
--- a/common.rc
+++ b/common.rc
@@ -867,6 +867,26 @@ _require_user()
     [ "$?" == "0" ] || _notrun "$qa_user user not defined."
 }
 
+_filter_user_do()
+{
+        perl -ne "
+s,.*Permission\sdenied.*,Permission denied,;
+s,.*no\saccess\sto\stty.*,,;
+s,.*no\sjob\scontrol\sin\sthis\sshell.*,,;
+s,^\s*$,,;
+        print;"
+}
+
+_user_do()
+{
+    if [ "$HOSTOS" == "IRIX" ]
+       then
+       echo $1 | /bin/bash "su $qa_user 2>&1" | _filter_user_do
+    else
+       echo $1 | su $qa_user 2>&1 | _filter_user_do
+    fi
+}
+
 # check that xfs_io, glibc, kernel, and filesystem all (!) support
 # fallocate
 #