am 55f87a0c: Merge "Force non-color output for bionic FileCheck tests"

* commit '55f87a0c0bb587ee85b5662967563462d52db560':
  Force non-color output for bionic FileCheck tests
This commit is contained in:
Colin Cross 2015-09-25 22:33:53 +00:00 committed by Android Git Automerger
commit b99b3f773c

View File

@ -425,6 +425,8 @@ LOCAL_CXX = $(LOCAL_PATH)/file-check-cxx \
LOCAL_CLANG := false
LOCAL_MODULE := bionic-compile-time-tests-g++
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
include $(BUILD_STATIC_LIBRARY)
@ -442,6 +444,8 @@ LOCAL_CXX := $(LOCAL_PATH)/file-check-cxx \
LOCAL_CLANG := true
LOCAL_MODULE := bionic-compile-time-tests-clang++
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
# don't appear to be any cases where clang _does_ emit warnings for sn?printf :(
LOCAL_SRC_FILES :=