Changeset 393 for trunk

Timestamp:

Feb 14, 2012, 9:04:40 PM (13 years ago)

Author:

katerina

Message:

Fix for ticket #290 (SUID regression test breaks with selinux).

File:

• trunk/test/testrun_1c.sh (modified) (5 diffs)

trunk/test/testrun_1c.sh

@@ -64 +64 @@
 chk_suiddata_7 () {
     one_sec_sleep
-    tmp=`ls -l "${BASE}/a/a/y" 2>/dev/null | awk '{ print $1}'`
+    tmp=`ls -l "${BASE}/a/a/y" 2>/dev/null | awk '{ print $1}' | cut -c 1-10`
     if [ "x$tmp" = "x-r-Sr--r--" ]; then
         egrep "CRIT.*POLICY \[SuidCheck\].*${BASE}/a/a/y" $LOGFILE >/dev/null 2>&1
@@ -80 +80 @@
         return 1
     fi
-    tmp=`ls -l "${BASE}/a/a/a/y" 2>/dev/null | awk '{ print $1}'`
+    tmp=`ls -l "${BASE}/a/a/a/y" 2>/dev/null | awk '{ print $1}' | cut -c 1-10`
     if [ "x$tmp" = "x-r-Sr--r--" ]; then
         egrep "CRIT.*POLICY \[SuidCheck\].*${BASE}/a/a/a/y" $LOGFILE >/dev/null 2>&1
@@ -96 +96 @@
         return 1
     fi
-    tmp=`ls -l "${BASE}/a/abc/y" 2>/dev/null | awk '{ print $1}'`
+    tmp=`ls -l "${BASE}/a/abc/y" 2>/dev/null | awk '{ print $1}' | cut -c 1-10`
     if [ "x$tmp" = "x-r-Sr--r--" ]; then
         egrep "CRIT.*POLICY \[SuidCheck\].*${BASE}/a/abc/y" $LOGFILE >/dev/null 2>&1
@@ -135 +135 @@
 chk_suiddata_6 () {
     one_sec_sleep
-    tmp=`ls -l "${BASE}/a/a/y" 2>/dev/null | awk '{ print $1}'`
+    tmp=`ls -l "${BASE}/a/a/y" 2>/dev/null | awk '{ print $1}' | cut -c 1-10`
     if [ "x$tmp" = "x-rwsr-xr-x" ]; then
         egrep "CRIT.*POLICY \[SuidCheck\].*${BASE}/a/a/y" $LOGFILE >/dev/null 2>&1
@@ -250 +250 @@
 chk_suiddata_3 () {
     one_sec_sleep
-    tmp=`ls -l "${BASE}/a/a/y" 2>/dev/null | awk '{ print $1}'`
+    tmp=`ls -l "${BASE}/a/a/y" 2>/dev/null | awk '{ print $1}' | cut -c 1-10`
     if [ "x$tmp" = "x-rwxr-xr-x" ]; then
         return 0;