Fix make check on Solaris 10/x86: the default grep is not GNU grep, same for as.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@57912 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/Makefile b/test/Makefile
index 391776b..6761148 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -110,6 +110,8 @@
@echo 'set shlibext "$(SHLIBEXT)"' >> site.tmp
@echo 'set ocamlc "$(OCAMLC) -cc $(CXX) -I $(LibDir)/ocaml"' >> site.tmp
@echo 'set valgrind "$(VALGRIND)"' >> site.tmp
+ @echo 'set grep "$(GREP)"' >>site.tmp
+ @echo 'set gas "$(GAS)"' >>site.tmp
@echo '## All variables above are generated by configure. Do Not Edit ## ' >>site.tmp
@test ! -f site.exp || \
sed '1,/^## All variables above are.*##/ d' site.exp >> site.tmp
diff --git a/test/lib/llvm.exp b/test/lib/llvm.exp
index a844152..b5d5cff 100644
--- a/test/lib/llvm.exp
+++ b/test/lib/llvm.exp
@@ -49,7 +49,7 @@
global srcroot objroot srcdir objdir subdir target_triplet prcontext
global llvmgcc llvmgxx llvmgcc_version llvmgccmajvers ocamlc
global gccpath gxxpath compile_c compile_cxx link shlibext llvmlibsdir
- global valgrind
+ global valgrind grep gas
set path [file join $srcdir $subdir]
# Substitute all Tcl variables.
@@ -84,6 +84,11 @@
#replace _#MARKER#_ with %
regsub -all {_#MARKER#_} $new_line % new_line
+ #replace grep with GNU grep
+ regsub -all { grep } $new_line " $grep " new_line
+ #replace as with GNU as
+ regsub -all {\| as } $new_line "| $gas " new_line
+
#valgind related stuff
# regsub -all {bugpoint } $new_line "$valgrind bugpoint " new_line
regsub -all {llc } $new_line "$valgrind llc " new_line