diff options
| author | Alexey Samsonov <samsonov@google.com> | 2012-02-13 09:14:31 +0000 |
|---|---|---|
| committer | Alexey Samsonov <samsonov@google.com> | 2012-02-13 09:14:31 +0000 |
| commit | 6e6083f4b1f7a6178426fd2ac6ea15f5a007449f (patch) | |
| tree | 1ca857fbda13aea48983d882e3d6268e33136bb6 /compiler-rt | |
| parent | b30df37ebf9692ee9beb0054427ed1b9b7cd754f (diff) | |
| download | bcm5719-llvm-6e6083f4b1f7a6178426fd2ac6ea15f5a007449f.tar.gz bcm5719-llvm-6e6083f4b1f7a6178426fd2ac6ea15f5a007449f.zip | |
AddressSanitizer: fix path to FileCheck in makefiles
llvm-svn: 150368
Diffstat (limited to 'compiler-rt')
| -rw-r--r-- | compiler-rt/lib/asan/Makefile.old | 3 | ||||
| -rwxr-xr-x | compiler-rt/lib/asan/output_tests/test_output.sh | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/compiler-rt/lib/asan/Makefile.old b/compiler-rt/lib/asan/Makefile.old index 5b78ad5971e..fd648aac9ff 100644 --- a/compiler-rt/lib/asan/Makefile.old +++ b/compiler-rt/lib/asan/Makefile.old @@ -61,6 +61,7 @@ CLANG_FLAGS= CLANG_BUILD=$(ROOT)/../../../../build/Release+Asserts CLANG_CC=$(CLANG_BUILD)/bin/clang $(CLANG_FLAGS) CLANG_CXX=$(CLANG_BUILD)/bin/clang++ $(CLANG_FLAGS) +FILE_CHECK=$(CLANG_BUILD)/bin/FileCheck CC=$(CLANG_CC) CXX=$(CLANG_CXX) @@ -213,7 +214,7 @@ test: t64 t32 output_tests lint @echo "ALL TESTS PASSED" output_tests: b32 b64 - cd output_tests && ./test_output.sh $(CLANG_CXX) $(CLANG_CC) + cd output_tests && ./test_output.sh $(CLANG_CXX) $(CLANG_CC) $(FILE_CHECK) t64: b64 $(BIN)/asan_test64 diff --git a/compiler-rt/lib/asan/output_tests/test_output.sh b/compiler-rt/lib/asan/output_tests/test_output.sh index f619244b46b..3cc91c36c89 100755 --- a/compiler-rt/lib/asan/output_tests/test_output.sh +++ b/compiler-rt/lib/asan/output_tests/test_output.sh @@ -5,9 +5,9 @@ set -e # fail on any error OS=`uname` CXX=$1 CC=$2 +FILE_CHECK=$3 CXXFLAGS="-mno-omit-leaf-frame-pointer -fno-omit-frame-pointer -fno-optimize-sibling-calls" SYMBOLIZER=../scripts/asan_symbolize.py -FILE_CHECK=../../../../../build/Release+Asserts/bin/FileCheck # check_program exe_file src_file [check_prefix] check_program() { |
