From 840be7cb790b6122bda2238999951c55d6483511 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Fri, 25 Sep 2015 14:42:07 -0700 Subject: [PATCH] Force non-color output for bionic FileCheck tests Turning on color output will break the bionic compilation tests that check for expected warnings, as they will be matching color output against non-color expected values. Turn off color locally. Bug: 24273983 Change-Id: Ia3b3262ccece121217f0dc0997734b3ad65b928b --- tests/Android.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/Android.mk b/tests/Android.mk index 6e61c7e7a..d58242549 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -420,6 +420,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) @@ -437,6 +439,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 :=