commit f16f4f8a6bac035db5f25538ddb4fe810d0719db
author Dan Willemsen <dwillemsen@google.com> Mon Sep 28 20:37:07 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 28 20:37:07 2015 +0000
tree 1e62cd142f2e1b087aa44b307b62c3556bb5d5cd
parent d5e8a0499b9efa147d45aabd47cfb2d2204c2323
parent 808602a4852d470f5420af3c1711ffc0a4e90777

Merge "Fix file-check-cxx to handle quoted arguments"

tests/file-check-cxx

diff --git a/tests/file-check-cxx b/tests/file-check-cxx
index 8ece835..4018265 100755
--- a/tests/file-check-cxx
+++ b/tests/file-check-cxx
@@ -2,10 +2,10 @@
 FILECHECK=$1
 CXX=$2
 PREFIX=$3
-ARGS=${*:4}
-SOURCE=$(echo $ARGS | grep -oP '\S+\.cpp\b')
-OBJ=$(echo $ARGS | grep -oP '\S+\.o\b')
-$CXX $ARGS 2>&1 | $FILECHECK -check-prefix=$PREFIX $SOURCE
+shift 3
+SOURCE=$(echo "$@" | grep -oP '\S+\.cpp\b')
+OBJ=$(echo "$@" | grep -oP '\S+\.o\b')
+$CXX "$@" 2>&1 | $FILECHECK -check-prefix=$PREFIX $SOURCE
 if [ "$?" -eq 0 ]; then
   touch $OBJ
 else