[llvm-commits] [compiler-rt] r150368 - in /compiler-rt/trunk/lib/asan: Makefile.old output_tests/test_output.sh

[Alexey Samsonov]

Author: samsonov
Date: Mon Feb 13 03:14:31 2012
New Revision: 150368

URL: http://llvm.org/viewvc/llvm-project?rev=150368&view=rev
Log:
AddressSanitizer: fix path to FileCheck in makefiles

Modified:
    compiler-rt/trunk/lib/asan/Makefile.old
    compiler-rt/trunk/lib/asan/output_tests/test_output.sh

Modified: compiler-rt/trunk/lib/asan/Makefile.old
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/Makefile.old?rev=150368&r1=150367&r2=150368&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/Makefile.old (original)
+++ compiler-rt/trunk/lib/asan/Makefile.old Mon Feb 13 03:14:31 2012
@@ -61,6 +61,7 @@
 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 @@
 	@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

Modified: compiler-rt/trunk/lib/asan/output_tests/test_output.sh
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/output_tests/test_output.sh?rev=150368&r1=150367&r2=150368&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/output_tests/test_output.sh (original)
+++ compiler-rt/trunk/lib/asan/output_tests/test_output.sh Mon Feb 13 03:14:31 2012
@@ -5,9 +5,9 @@
 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() {