Merge "Force non-color output for bionic FileCheck tests"
This commit is contained in:
		@@ -425,6 +425,8 @@ LOCAL_CXX = $(LOCAL_PATH)/file-check-cxx \
 | 
				
			|||||||
LOCAL_CLANG := false
 | 
					LOCAL_CLANG := false
 | 
				
			||||||
LOCAL_MODULE := bionic-compile-time-tests-g++
 | 
					LOCAL_MODULE := bionic-compile-time-tests-g++
 | 
				
			||||||
LOCAL_CPPFLAGS := -Wall
 | 
					LOCAL_CPPFLAGS := -Wall
 | 
				
			||||||
 | 
					# Disable color diagnostics so the warnings output matches the source
 | 
				
			||||||
 | 
					LOCAL_CPPFLAGS +=  -fdiagnostics-color=never
 | 
				
			||||||
LOCAL_SRC_FILES := fortify_compilation_test.cpp
 | 
					LOCAL_SRC_FILES := fortify_compilation_test.cpp
 | 
				
			||||||
include $(BUILD_STATIC_LIBRARY)
 | 
					include $(BUILD_STATIC_LIBRARY)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -442,6 +444,8 @@ LOCAL_CXX := $(LOCAL_PATH)/file-check-cxx \
 | 
				
			|||||||
LOCAL_CLANG := true
 | 
					LOCAL_CLANG := true
 | 
				
			||||||
LOCAL_MODULE := bionic-compile-time-tests-clang++
 | 
					LOCAL_MODULE := bionic-compile-time-tests-clang++
 | 
				
			||||||
LOCAL_CPPFLAGS := -Wall
 | 
					LOCAL_CPPFLAGS := -Wall
 | 
				
			||||||
 | 
					# Disable color diagnostics so the warnings output matches the source
 | 
				
			||||||
 | 
					LOCAL_CPPFLAGS += -fno-color-diagnostics
 | 
				
			||||||
# FileCheck will error if there aren't any CLANG: lines in the file, but there
 | 
					# FileCheck will error if there aren't any CLANG: lines in the file, but there
 | 
				
			||||||
# don't appear to be any cases where clang _does_ emit warnings for sn?printf :(
 | 
					# don't appear to be any cases where clang _does_ emit warnings for sn?printf :(
 | 
				
			||||||
LOCAL_SRC_FILES :=
 | 
					LOCAL_SRC_FILES :=
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user