tests: replace egrep -> grep -E

"egrep" is an obsolete alias for grep -E and newer greps will warn on usage
of egrep, so let's just swap it out.

Signed-off-by: Sam James <sam@gentoo.org>

diff --git a/tests/chsh/01/run b/tests/chsh/01/run
index 72760c26411e5ae7d712a2233d01ca277c22fcd3..4d72eea35edaf01f76355b70890963dbc5cd5ce5 100755 (executable)
--- a/tests/chsh/01/run
+++ b/tests/chsh/01/run
@@ -105,7 +105,7 @@ echo $(pwd)/tmp/sh:ell >> /etc/shells
 chsh -s $(pwd)/tmp/sh:ell myuser 2> tmp/out && exit 1
 ent=$(getent passwd myuser)
 [ "$ent" = "myuser:x:424242:424242::/home:/bin/bash" ] || exit 1
-egrep "chsh: Invalid entry: .*/tmp/sh:ell" tmp/out > /dev/null
+grep -E "chsh: Invalid entry: .*/tmp/sh:ell" tmp/out > /dev/null
 [ $(wc -l tmp/out| cut -d" " -f1) = "1" ] || exit 1
 echo "OK"
 
@@ -136,7 +136,7 @@ echo "OK"
 echo "testing the interactive mode (4)..."
 rm -f tmp/out
 ./run.exp $(pwd)/tmp/sh:ell myuser && exit 1
-egrep "chsh: Invalid entry: .*/tmp/sh:ell" tmp/out > /dev/null
+grep -E "chsh: Invalid entry: .*/tmp/sh:ell" tmp/out > /dev/null
 ent=$(getent passwd myuser)
 [ "$ent" = "myuser:x:424242:424242::/home:/bin/sh" ] || exit 1
 echo "OK"

diff --git a/tests/convtools/01/run b/tests/convtools/01/run
index 81ceef1254aeef6752b22412b57a467d86c8f3b9..fadf7c880cfec0046cbff63a560fd5ee94671f8c 100755 (executable)
--- a/tests/convtools/01/run
+++ b/tests/convtools/01/run
@@ -21,7 +21,7 @@ save()
        done
        DATE=$(date '+%s')
        DATE=$(( DATE/3600/24 ))
-       WARN=$( egrep "^PASS_WARN_AGE" /etc/login.defs | { read var val ; echo $val; } )
+       WARN=$( grep -E "^PASS_WARN_AGE" /etc/login.defs | { read var val ; echo $val; } )
        saveifs=$IFS
        IFS=":"
        cat data/2/shadow |

diff --git a/tests/su/10_su_sulog_success/su.test b/tests/su/10_su_sulog_success/su.test
index 79beb18524649f69f298c14f6ad084170f0dfde3..3e98b36d44ac195bed1b7fa74256f6738be88427 100755 (executable)
--- a/tests/su/10_su_sulog_success/su.test
+++ b/tests/su/10_su_sulog_success/su.test
@@ -27,8 +27,8 @@ echo -n "Check /var/log/sulog..."
 wc -l /var/log/sulog > tmp/sulog
 d=$(date +"SU %m/%d %H:%M")
 cat /var/log/sulog | \
-    egrep -v "$d \+ /dev/pts/[0-9]* root-testsuite" | \
-    egrep -v "$d \+ /dev/pts/[0-9]* testsuite-myuser" \
+    grep -E -v "$d \+ /dev/pts/[0-9]* root-testsuite" | \
+    grep -E -v "$d \+ /dev/pts/[0-9]* testsuite-myuser" \
         >> tmp/sulog || true
 diff -auN tmp/sulog data/sulog
 echo "OK"

diff --git a/tests/su/11_su_sulog_failure/su.test b/tests/su/11_su_sulog_failure/su.test
index 9ca17696033d21d9af9bb9010dc1819ae6113a0c..3a46eaa93583d25173a142d770cedcc9c09bd5c5 100755 (executable)
--- a/tests/su/11_su_sulog_failure/su.test
+++ b/tests/su/11_su_sulog_failure/su.test
@@ -28,10 +28,10 @@ wc -l /var/log/sulog > tmp/sulog
 d1=$(date +"SU %m/%d %H:%M")
 d2=$(date -d"1 minute ago" +"SU %m/%d %H:%M")
 cat /var/log/sulog | \
-    egrep -v "$d1 \+ /dev/pts/[0-9]* root-testsuite"  | \
-    egrep -v "$d2 \+ /dev/pts/[0-9]* root-testsuite"  | \
-    egrep -v "$d1 - /dev/pts/[0-9]* testsuite-myuser" | \
-    egrep -v "$d2 - /dev/pts/[0-9]* testsuite-myuser" \
+    grep -E -v "$d1 \+ /dev/pts/[0-9]* root-testsuite"  | \
+    grep -E -v "$d2 \+ /dev/pts/[0-9]* root-testsuite"  | \
+    grep -E -v "$d1 - /dev/pts/[0-9]* testsuite-myuser" | \
+    grep -E -v "$d2 - /dev/pts/[0-9]* testsuite-myuser" \
         >> tmp/sulog || true
 diff -au data/sulog tmp/sulog
 echo "OK"