summaryrefslogtreecommitdiffstats
path: root/tools/clang
diff options
context:
space:
mode:
authorjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-15 16:36:56 +0000
committerjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-15 16:36:56 +0000
commit7c149a95306ba73d52b8cbc2f202eff8c9486c59 (patch)
treeca3cb18be218f9c522e4722f329b0f2cf22792df /tools/clang
parentd621595739ef83ad6263937f87ac9c5204dc8f55 (diff)
downloadchromium_src-7c149a95306ba73d52b8cbc2f202eff8c9486c59.zip
chromium_src-7c149a95306ba73d52b8cbc2f202eff8c9486c59.tar.gz
chromium_src-7c149a95306ba73d52b8cbc2f202eff8c9486c59.tar.bz2
Revert 109982 - Roll clang 143497:144521
Reason: Was causing Clang crashes on Google Chrome Mac official builder, e.g. http://build.chromium.org/p/chromium.chrome/builders/Google%20Chrome%20Mac/builds/5731) Linux directory detection is now done in the driver instead of in the frontend, so let the plugin test script invoke the driver instead of clang -cc1 (else it won't find <string> etc on linux). BUG=none TEST=none TBR=hans Review URL: http://codereview.chromium.org/8538027 TBR=thakis@chromium.org Review URL: http://codereview.chromium.org/8574008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110101 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/clang')
-rwxr-xr-xtools/clang/plugins/tests/test.sh6
-rwxr-xr-xtools/clang/scripts/update.sh2
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/clang/plugins/tests/test.sh b/tools/clang/plugins/tests/test.sh
index fcfd213..c74cd3a 100755
--- a/tools/clang/plugins/tests/test.sh
+++ b/tools/clang/plugins/tests/test.sh
@@ -23,9 +23,9 @@ usage() {
# 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}"
diff --git a/tools/clang/scripts/update.sh b/tools/clang/scripts/update.sh
index c3eae93..0cfa558 100755
--- a/tools/clang/scripts/update.sh
+++ b/tools/clang/scripts/update.sh
@@ -7,7 +7,7 @@
# Do NOT CHANGE this if you don't know what you're doing -- see
# http://code.google.com/p/chromium/wiki/UpdatingClang
-CLANG_REVISION=144521
+CLANG_REVISION=143497
THIS_DIR="$(dirname "${0}")"
LLVM_DIR="${THIS_DIR}/../../../third_party/llvm"