Skip to content

Commit

Permalink
Replaced fgrep by grep -F. bsc#1203227
Browse files Browse the repository at this point in the history
  • Loading branch information
mchf committed Sep 8, 2022
1 parent bdbf81d commit 78ea5f8
Show file tree
Hide file tree
Showing 12 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion agent-any/testsuite/tests/runtest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
unset Y2DEBUG
unset Y2DEBUGGER

(./runag_anyagent -l - $1 >$2) 2>&1 | fgrep -v " <0> " | grep -v "^$" | sed 's/^....-..-.. ..:..:.. [^)]*) //g' > $3
(./runag_anyagent -l - $1 >$2) 2>&1 | grep -F -v " <0> " | grep -v "^$" | sed 's/^....-..-.. ..:..:.. [^)]*) //g' > $3
2 changes: 1 addition & 1 deletion agent-ini/testsuite/debug/runtest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ cp $IN_FILE "$IN_FILE.test" 2> /dev/null
(./runag_ini -l - $1 >$2) 2>&1 | grep -v "^$" \
| grep -E '^....-..-.. ..:..:.. (.*\[agent-ini\]|<[1-5]>)' \
| sed '-e s/^....-..-.. ..:..:.. [^)]*) //g' -e 's/:[0-9]\+ /:XXX /' > $3
##(./runag_ini -l - $1 >$2) 2>&1 | fgrep -v " <0> " | grep -v "^$" | sed 's/^....-..-.. ..:..:.. [^)]*) //g' > $3
##(./runag_ini -l - $1 >$2) 2>&1 | grep -F -v " <0> " | grep -v "^$" | sed 's/^....-..-.. ..:..:.. [^)]*) //g' > $3

cat "$IN_FILE.test" >> $2 2> /dev/null

2 changes: 1 addition & 1 deletion agent-ini/testsuite/multi/runtest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ done
(./runag_ini -l - $1 >$2) 2>&1 | grep -v "^$" \
| grep -E '^....-..-.. ..:..:.. (.*\[agent-ini\]|<[1-5]>)' \
| sed '-e s/^....-..-.. ..:..:.. [^)]*) //g' -e 's/:[0-9]\+ /:XXX /' > $3
##(./runag_ini -l - $1 >$2) 2>&1 | fgrep -v " <0> " | grep -v "^$" | sed 's/^....-..-.. ..:..:.. [^)]*) //g' > $3
##(./runag_ini -l - $1 >$2) 2>&1 | grep -F -v " <0> " | grep -v "^$" | sed 's/^....-..-.. ..:..:.. [^)]*) //g' > $3

IN_FILE=${1%.*}".in.[0-9].test"
for I in $IN_FILE; do
Expand Down
4 changes: 2 additions & 2 deletions agent-ini/testsuite/tests/runtest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ IN_FILE=${1%.*}".in"
rm -f "$IN_FILE.test" 2> /dev/null
cp $IN_FILE "$IN_FILE.test" 2> /dev/null

(./runag_ini -l - $1 >$2) 2>&1 | fgrep -v " <0> " | grep -v "^$" | sed '-e s/^....-..-.. ..:..:.. [^)]*) //g' -e 's/:[0-9]\+ /:XXX /' > $3
##(./runag_ini -l - $1 >$2) 2>&1 | fgrep -v " <0> " | grep -v "^$" | sed 's/^....-..-.. ..:..:.. [^)]*) //g' > $3
(./runag_ini -l - $1 >$2) 2>&1 | grep -F -v " <0> " | grep -v "^$" | sed '-e s/^....-..-.. ..:..:.. [^)]*) //g' -e 's/:[0-9]\+ /:XXX /' > $3
##(./runag_ini -l - $1 >$2) 2>&1 | grep -F -v " <0> " | grep -v "^$" | sed 's/^....-..-.. ..:..:.. [^)]*) //g' > $3

cat "$IN_FILE.test" >> $2 2> /dev/null

2 changes: 1 addition & 1 deletion agent-modules/testsuite/tests/runtest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ SCR_FILE=${1%.*}".scr"
rm -f "$SCR_FILE" 2>/dev/null
echo -e ".\n\n\`ag_modules(\n \`ModulesConf(\"$IN_FILE.test\")\n)\n" >"$SCR_FILE"

(./runmodules -l - "$1" >"$2") 2>&1 | fgrep -v " <0> " | grep -v "^$" | sed 's/^....-..-.. ..:..:.. [^)]*) //g' >$3
(./runmodules -l - "$1" >"$2") 2>&1 | grep -F -v " <0> " | grep -v "^$" | sed 's/^....-..-.. ..:..:.. [^)]*) //g' >$3

cat "$IN_FILE.test" >>"$2" 2>/dev/null
exit 0
2 changes: 1 addition & 1 deletion agent-process/testsuite/tests/runtest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export Y2DEBUGSHELL=1
# ignore also milestones (they are not constant and logged by liby2util - cannot be simply turned off)
# ignore also line numbers (any change in the core might make the testsuite fail)
(./run_ag_process -l - $1 >$2) 2>&1 | \
fgrep -v -e " <0> " -e " <1> " | \
grep -F -v -e " <0> " -e " <1> " | \
grep -v "^$" | \
sed 's/^....-..-.. ..:..:.. [^)]*) //g' | \
sed 's/^\(\[[^]]\+\] [^(]\+([^)]\+)\):[0-9]\+ \(.*\)/\1 \2/g' \
Expand Down
2 changes: 1 addition & 1 deletion agent-resolver/testsuite/tests/runtest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ SCR_FILE=${1%.*}".scr"
rm -f "$SCR_FILE" 2>/dev/null
echo -e ".\n\n\`ag_resolver(\n \`ResolverAgent(\"$IN_FILE.test\")\n)\n" >"$SCR_FILE"

(./runresolver -l - "$1" >"$2") 2>&1 | fgrep -v " <0> " | grep -v "^$" | sed 's/^....-..-.. ..:..:.. [^)]*) //g' >$3
(./runresolver -l - "$1" >"$2") 2>&1 | grep -F -v " <0> " | grep -v "^$" | sed 's/^....-..-.. ..:..:.. [^)]*) //g' >$3

cat "$IN_FILE.test" >>"$2" 2>/dev/null
exit 0
2 changes: 1 addition & 1 deletion agent-system/testsuite/tests/runtest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ unset Y2DEBUG
unset Y2DEBUGGER
export Y2DEBUGSHELL=1

(./runag_system -l - $1 >$2) 2>&1 | fgrep -v " <0> " | grep -v "^$" | sed 's/^....-..-.. ..:..:.. [^)]*) //g' > $3
(./runag_system -l - $1 >$2) 2>&1 | grep -F -v " <0> " | grep -v "^$" | sed 's/^....-..-.. ..:..:.. [^)]*) //g' > $3
2 changes: 1 addition & 1 deletion libycp/testsuite/mkdata.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#! /bin/bash
# mkdata make test data
#
(../runycp <$1.ycp >$1.out) 2>&1 | fgrep -v " <0> " | sed 's/^....-..-.. ..:..:.. [^:]*://g' > $1.err
(../runycp <$1.ycp >$1.out) 2>&1 | grep -F -v " <0> " | sed 's/^....-..-.. ..:..:.. [^:]*://g' > $1.err

2 changes: 1 addition & 1 deletion libycp/testsuite/runtest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ export Y2SILENTSEARCH=1
# for float::tolstring
export LC_NUMERIC=cs_CZ.UTF8

(./runycp -l - -I tests/Include -M tests/Module $1 >$2) 2>&1 | fgrep -v 'Electric Fence' | fgrep -v " <0> " | grep -v "^$" | sed 's/^....-..-.. ..:..:.. [^)]*) //g' > $3
(./runycp -l - -I tests/Include -M tests/Module $1 >$2) 2>&1 | grep -F -v 'Electric Fence' | grep -F -v " <0> " | grep -v "^$" | sed 's/^....-..-.. ..:..:.. [^)]*) //g' > $3
exit 0
2 changes: 1 addition & 1 deletion scr/testsuite/tests/runtest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
unset Y2DEBUG
unset Y2DEBUGGER

(./runscr -l - $1 >$2) 2>&1 | fgrep -v " <0> " | grep -v "^$" | sed 's/^....-..-.. ..:..:.. [^)]*) //g' > $3
(./runscr -l - $1 >$2) 2>&1 | grep -F -v " <0> " | grep -v "^$" | sed 's/^....-..-.. ..:..:.. [^)]*) //g' > $3
2 changes: 1 addition & 1 deletion wfm/testsuite/tests/runtest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ unset LANGUAGE
unset Y2DEBUG
unset Y2DEBUGGER

(./runwfm -l - $1 >$2) 2>&1 | fgrep -v " <0> " | grep -v "^$" | sed -e 's/^....-..-.. ..:..:.. [^)]*) //g' -e 's/):[0-9]\+ /):XXX /' > $3
(./runwfm -l - $1 >$2) 2>&1 | grep -F -v " <0> " | grep -v "^$" | sed -e 's/^....-..-.. ..:..:.. [^)]*) //g' -e 's/):[0-9]\+ /):XXX /' > $3

0 comments on commit 78ea5f8

Please sign in to comment.