[lit] Fix handling of per test timeout when the installed psutil version

[oota-llvm.git] / utils / llvmgrep

diff --git a/utils/llvmgrep b/utils/llvmgrep
index c24dc6f3ab6a59ba74b3b774ead07a1054f57980..dc15da4961efcad5cd8c668056af99f1c7099ccd 100755 (executable)
--- a/utils/llvmgrep
+++ b/utils/llvmgrep
@@ -3,8 +3,8 @@
 # 
 #                     The LLVM Compiler Infrastructure
 #
-# This file was developed by Reid Spencer and is distributed under the 
-# University of Illinois Open Source License. See LICENSE.TXT for details.
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
 # 
 ##===----------------------------------------------------------------------===##
 #
@@ -29,11 +29,11 @@ if test -d "$TOPDIR" ; then
   cd $TOPDIR
   case `uname -s` in
     SunOS) grep_cmd="ggrep -H -n" ;;
-    Linux) grep_cmd="egrep -H -n" ;;
+    Linux|Darwin) grep_cmd="egrep -H -n" ;;
     *) grep_cmd="egrep -l -n" ;;
   esac
   ./utils/llvmdo -topdir "$TOPDIR" \
-    -dirs "include lib tools utils docs examples test projects" $grep_cmd "$*"
+    -dirs "include lib tools utils docs examples test unittests projects cmake" $grep_cmd "$*"
 else
   echo "Can't find LLVM top directory"
 fi