aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Kangas2021-11-10 16:30:50 +0100
committerStefan Kangas2021-11-10 16:30:50 +0100
commit3aad70326db4b654c836be97f7b96bb71e10202a (patch)
tree8d2b84f1c02468e529ecff95316691d390053673
parent810fa21d26453f898de9747ece7205dfe6de9d08 (diff)
downloademacs-3aad70326db4b654c836be97f7b96bb71e10202a.tar.gz
emacs-3aad70326db4b654c836be97f7b96bb71e10202a.zip
Use "grep -E" instead of deprecated "egrep"
* admin/emake: * test/lisp/so-long-tests/so-long-tests.el: Use "grep -E" instead of deprecated "egrep".
-rwxr-xr-xadmin/emake6
-rw-r--r--test/lisp/so-long-tests/so-long-tests.el4
2 files changed, 5 insertions, 5 deletions
diff --git a/admin/emake b/admin/emake
index 8c37c160555..2ff553289da 100755
--- a/admin/emake
+++ b/admin/emake
@@ -13,7 +13,7 @@ cores=1
13 13
14# Determine the number of cores. 14# Determine the number of cores.
15if [ -f /proc/cpuinfo ]; then 15if [ -f /proc/cpuinfo ]; then
16 cores=$(($(egrep "^physical id|^cpu cores" /proc/cpuinfo |\ 16 cores=$(($(grep -E "^physical id|^cpu cores" /proc/cpuinfo |\
17 awk '{ print $4; }' |\ 17 awk '{ print $4; }' |\
18 sed '$!N;s/\n/ /' |\ 18 sed '$!N;s/\n/ /' |\
19 uniq |\ 19 uniq |\
@@ -30,7 +30,7 @@ s#^Configured for # Configured for #
30s#^./temacs.*# \\& # 30s#^./temacs.*# \\& #
31s#^make.*Error# \\& # 31s#^make.*Error# \\& #
32' | \ 32' | \
33egrep --line-buffered -v "^make|\ 33grep -E --line-buffered -v "^make|\
34^Loading|\ 34^Loading|\
35SCRAPE|\ 35SCRAPE|\
36INFO.*Scraping.*[.] ?\$|\ 36INFO.*Scraping.*[.] ?\$|\
@@ -93,4 +93,4 @@ done
93# changed since last time. 93# changed since last time.
94make -j$cores check-maybe 2>&1 | \ 94make -j$cores check-maybe 2>&1 | \
95 sed -n '/contained unexpected results/,$p' | \ 95 sed -n '/contained unexpected results/,$p' | \
96 egrep --line-buffered -v "^make" 96 grep -E --line-buffered -v "^make"
diff --git a/test/lisp/so-long-tests/so-long-tests.el b/test/lisp/so-long-tests/so-long-tests.el
index 7eee345aadd..cda5ae497fd 100644
--- a/test/lisp/so-long-tests/so-long-tests.el
+++ b/test/lisp/so-long-tests/so-long-tests.el
@@ -32,7 +32,7 @@
32;; Running manually: 32;; Running manually:
33;; 33;;
34;; for test in lisp/so-long-tests/*-tests.el; do make ${test%.el}; done \ 34;; for test in lisp/so-long-tests/*-tests.el; do make ${test%.el}; done \
35;; 2>&1 | egrep -v '^(Loading|Source file|make|Changed to so-long-mode)' 35;; 2>&1 | grep -E -v '^(Loading|Source file|make|Changed to so-long-mode)'
36;; 36;;
37;; Which is equivalent to: 37;; Which is equivalent to:
38;; 38;;
@@ -41,7 +41,7 @@
41;; "../src/emacs" --no-init-file --no-site-file --no-site-lisp \ 41;; "../src/emacs" --no-init-file --no-site-file --no-site-lisp \
42;; -L ":." -l ert -l "$test" --batch --eval \ 42;; -L ":." -l ert -l "$test" --batch --eval \
43;; '(ert-run-tests-batch-and-exit (quote (not (tag :unstable))))'; \ 43;; '(ert-run-tests-batch-and-exit (quote (not (tag :unstable))))'; \
44;; done 2>&1 | egrep -v '^(Loading|Source file|Changed to so-long-mode)' 44;; done 2>&1 | grep -E -v '^(Loading|Source file|Changed to so-long-mode)'
45;; 45;;
46;; See also `ert-run-tests-batch-and-exit'. 46;; See also `ert-run-tests-batch-and-exit'.
47 47