3 files changed, 8 insertions, 4 deletions
diff --git a/gold/testsuite/icf_safe_so_test.sh b/gold/testsuite/icf_safe_so_test.sh
index 6542c65..28600be 100755
--- a/gold/testsuite/icf_safe_so_test.sh
+++ b/gold/testsuite/icf_safe_so_test.sh
@@ -27,6 +27,8 @@
 # to verify if identical code folding in safe mode correctly folds
 # functions in a shared object.
 
+set -e
+
 error_if_symbol_absent()
 {
     if ! is_symbol_present $1 $2;
@@ -84,8 +86,7 @@ END {
 
 arch_specific_safe_fold()
 {
-    grep -e "Intel 80386" -e "ARM" -e "PowerPC" $1 > /dev/null 2>&1
-    if [ $? -eq 0 ];
+    if grep -q -e "Intel 80386" -e "ARM" -e "PowerPC" $1;
     then
       check_fold $2 $4 $5 $3
     else
diff --git a/gold/testsuite/icf_safe_test.sh b/gold/testsuite/icf_safe_test.sh
index 4765016..f048d86 100755
--- a/gold/testsuite/icf_safe_test.sh
+++ b/gold/testsuite/icf_safe_test.sh
@@ -27,6 +27,8 @@
 # ctors and dtors are folded, except for x86 (32 and 64 bit), which
 # uses relocation types to detect if function pointers are taken.
 
+set -e
+
 check_nofold()
 {
     func_addr_1=`grep $2 $1 | awk '{print $1}'`
@@ -57,8 +59,7 @@ END {
 
 arch_specific_safe_fold()
 {
-    grep_x86=`grep -q -e "Advanced Micro Devices X86-64" -e "Intel 80386" -e "ARM" -e "TILE" -e "PowerPC" -e "AArch64" -e "IBM S/390" $2`
-    if [ $? -eq 0 ];
+    if grep -q -e "Advanced Micro Devices X86-64" -e "Intel 80386" -e "ARM" -e "TILE" -e "PowerPC" -e "AArch64" -e "IBM S/390" $2;
     then
       check_fold $3 $4 $5
     else
diff --git a/gold/testsuite/icf_test.sh b/gold/testsuite/icf_test.sh
index 3d11dcb..2e7fd9d 100755
--- a/gold/testsuite/icf_test.sh
+++ b/gold/testsuite/icf_test.sh
@@ -26,6 +26,8 @@
 # File icf_test.cc is in this test. This program checks if the 
 # identical sections are correctly folded.
 
+set -e
+
 check()
 {
     awk "