Change behavior of doubleBuildWithWNoError for Android

"Double build with -Wno-error" is always on in the Android useLlvmNext
wrapper and always off in the production wrapper.  The warnings JSON is
written to $OUT_DIR/warnings_reports.

NFC for the ChromeOS configs.

Originally reviewed in https://android-review.googlesource.com/c/1242126.

BUG=b:149836702
TEST=go test

Change-Id: I5f1a43524772d991b5c64422189643cde61c3826
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/2079547
Tested-by: Pirama Arumuga Nainar <pirama@google.com>
Reviewed-by: George Burgess <gbiv@chromium.org>

1 files changed, 44 insertions, 0 deletions

diff --git a/compiler_wrapper/disable_werror_flag_test.go b/compiler_wrapper/disable_werror_flag_test.go
index fb25d193..eb907e6b 100644
--- a/compiler_wrapper/disable_werror_flag_test.go
+++ b/compiler_wrapper/disable_werror_flag_test.go
@@ -11,6 +11,7 @@ import (
 	"io"
 	"io/ioutil"
 	"os"
+	"path"
 	"path/filepath"
 	"strings"
 	"testing"
@@ -372,3 +373,46 @@ func TestDoubleBuildWerrorChmodsThingsAppropriately(t *testing.T) {
 		}
 	})
 }
+
+func TestAndroidGetNewWarningsDir(t *testing.T) {
+	withTestContext(t, func(ctx *testContext) {
+		outDir := "/foo/bar"
+		expectedDir := path.Join(outDir, "warnings_reports")
+
+		ctx.env = []string{"OUT_DIR=" + outDir}
+		ctx.cfg.isAndroidWrapper = true
+
+		// Disable werror ON
+		ctx.cfg.useLlvmNext = true
+		dir, ok := getNewWarningsDir(ctx, ctx.cfg)
+		if !ok || dir != expectedDir {
+			t.Errorf("disable Werror not enabled for Android with useLlvmNext (dirName=%q ok=%t), expectedDir=%q", dir, ok, expectedDir)
+		}
+
+		// Disable werror OFF
+		ctx.cfg.useLlvmNext = false
+		dir, ok = getNewWarningsDir(ctx, ctx.cfg)
+		if ok || dir != "" {
+			t.Errorf("disable Werror incorrectly enabled for Android without useLlvmNext (dirName=%q ok=%t)", dir, ok)
+		}
+	})
+}
+
+func TestChromeOSGetNewWarningsDirOn(t *testing.T) {
+	withForceDisableWErrorTestContext(t, func(ctx *testContext) {
+		dir, ok := getNewWarningsDir(ctx, ctx.cfg)
+		if !ok || dir != ctx.cfg.newWarningsDir {
+			t.Errorf("disable Werror not enabled for ChromeOS with FORCE_DISABLE_WERROR set (dirName=%q ok=%t) expectedDir=%q", dir, ok, ctx.cfg.newWarningsDir)
+		}
+
+	})
+}
+
+func TestChromeOSGetNewWarningsDirOff(t *testing.T) {
+	withTestContext(t, func(ctx *testContext) {
+		dir, ok := getNewWarningsDir(ctx, ctx.cfg)
+		if ok || dir != "" {
+			t.Errorf("disable Werror incorrectly enabled for ChromeOS without FORCE_DISABLE_WERROR set (dirName=%q ok=%t)", dir, ok)
+		}
+	})
+}