Revert 109982 - Roll clang 143497:144521

tools/clang/plugins/tests/test.sh

 #!/bin/bash
 #
 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
 # Hacky, primitive testing: This runs the style plugin for a set of input files
 # and compares the output with golden result files.
 
 E_BADARGS=65
 E_FAILEDTEST=1
 
 failed_any_test=
 
 # Prints usage information.
 usage() {
   echo "Usage: $(basename "${0}")" \
     "<Path to the llvm build dir, usually Release+Asserts>"
   echo ""
   echo "  Runs all the libFindBadConstructs unit tests"
   echo ""
 }
 
 # Runs a single test case.
 do_testcase() {
-  local output="$("${CLANG_DIR}"/bin/clang -c \
-      -Xclang -load -Xclang "${CLANG_DIR}"/lib/libFindBadConstructs.${LIB} \
-      -Xclang -plugin -Xclang find-bad-constructs ${1} 2>&1)"
+  local output="$("${CLANG_DIR}"/bin/clang -cc1 \
+      -load "${CLANG_DIR}"/lib/libFindBadConstructs.${LIB} \
+      -plugin find-bad-constructs ${1} 2>&1)"
   local diffout="$(echo "${output}" | diff - "${2}")"
   if [ "${diffout}" = "" ]; then
     echo "PASS: ${1}"
   else
     failed_any_test=yes
     echo "FAIL: ${1}"
     echo "Output of compiler:"
     echo "${output}"
     echo "Expected output:"
     cat "${2}"
@@ skipping 24 matching lines @@
   fi
 fi
 
 for input in *.cpp; do
   do_testcase "${input}" "${input%cpp}txt"
 done
 
 if [[ "${failed_any_test}" ]]; then
   exit ${E_FAILEDTEST}
 fi