From 76a47998afc52a1da9a444771da2d68f3a144b8b Mon Sep 17 00:00:00 2001
From: Rashad Kanavath <rashad.kanavath@c-s.fr>
Date: Tue, 29 Aug 2017 10:13:44 +0200
Subject: [PATCH] TEST: fix grep in cmake files
---
Packaging/Files/selftester.sh | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/Packaging/Files/selftester.sh b/Packaging/Files/selftester.sh
index 0969d903d1..e036c2d66b 100755
--- a/Packaging/Files/selftester.sh
+++ b/Packaging/Files/selftester.sh
@@ -204,16 +204,6 @@ else
echo "Check 3/4 : PASS"
fi
-GREP=$(which grep)
-RES=$($GREP -Rs "/usr/" > /dev/null)
-
-# clean any background process
-ps_children $$ >tmp.log
-for pid in $(cut -d ' ' -f 1 < tmp.log); do
- kill -9 "$pid"
-done
-rm -f tmp.log
-
grep_cmd=$(which grep)
grep_out=$($grep_cmd -Rs "/usr/" "$CUR_DIR/lib/cmake/")
grep_ret=$?
@@ -224,3 +214,10 @@ if [ $grep_ret -ne 1 ]; then
else
echo "Check 4/4 : PASS"
fi
+
+# clean any background process
+ps_children $$ >tmp.log
+for pid in $(cut -d ' ' -f 1 < tmp.log); do
+ kill -9 "$pid"
+done
+rm -f tmp.log
--
GitLab