LU-3227 tests: fix for acl test

acl permission test will failed by a wrong system
message. Change script to adapt this issue.
Combined with other small change for lprocfs.

Signed-off-by: Yang Sheng <yang.sheng@intel.com>
Change-Id: I42d1e02c0f0990500b02085d60e2dc47f93f1bcc
Reviewed-on: http://review.whamcloud.com/10007
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: James Simmons <uja.ornl@gmail.com>
Reviewed-by: Jian Yu <jian.yu@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/lustre/obdclass/lprocfs_status.c b/lustre/obdclass/lprocfs_status.c
index 8b8effa..938cb7a 100644 (file)
--- a/lustre/obdclass/lprocfs_status.c
+++ b/lustre/obdclass/lprocfs_status.c
@@ -3328,7 +3328,7 @@ int lprocfs_recovery_status_seq_show(struct seq_file *m, void *data)
 
        LASSERT(obd != NULL);
 
-       seq_printf(m, "status: \n");
+       seq_printf(m, "status: ");
        if (obd->obd_max_recoverable_clients == 0) {
                seq_printf(m, "INACTIVE\n");
                goto out;

diff --git a/lustre/tests/acl/permissions.test b/lustre/tests/acl/permissions.test
index 04accac..a7ca8e0 100644 (file)
--- a/lustre/tests/acl/permissions.test
+++ b/lustre/tests/acl/permissions.test
@@ -205,8 +205,8 @@ although it pass in FC2. commented out by CFS (agreed with HP)
 Replaced "echo" with "touch" can resolve such problem.
 #      $ echo i > e/i
 #      > e/i: Permission denied
-        $ touch e/i
-        > touch: cannot touch `e/i': Permission denied
+        $ touch e/i 2>&1 | sed -e "s/\\`/\\'/"
+        > touch: cannot touch 'e/i': Permission denied
 
        $ su
        $ setfacl -m u:bin:rwx e