Snap for 10843824 from 0348d10214299073ea59bda4987dd8813a9e7812 to 24Q1-releaseandroid-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release

Change-Id: Ia39ecafdc4b00a0b2505b638c14b80c02e34d4b6

1 files changed, 45 insertions, 0 deletions

diff --git a/compiler_wrapper/clang_flags_test.go b/compiler_wrapper/clang_flags_test.go
index 08e8a8dc..8b3f5a24 100644
--- a/compiler_wrapper/clang_flags_test.go
+++ b/compiler_wrapper/clang_flags_test.go
@@ -33,6 +33,36 @@ func TestClangBasename(t *testing.T) {
 	})
 }
 
+func TestAppendCppFlags(t *testing.T) {
+	withTestContext(t, func(ctx *testContext) {
+		ctx.cfg.cppFlags = append(ctx.cfg.cppFlags, "cppOnlyFlag")
+		// C++ only flags are disabled on clang.
+		clangCmd := ctx.must(callCompiler(ctx, ctx.cfg,
+			ctx.newCommand("./x86_64-cros-linux-gnu-clang", mainCc)))
+		if err := verifyArgCount(clangCmd, 0, "cppOnlyFlag"); err != nil {
+			t.Error(err)
+		}
+		// C++ only flags are enabled on clang++.
+		clangPlusPlusCmd := ctx.must(callCompiler(ctx, ctx.cfg,
+			ctx.newCommand("./x86_64-cros-linux-gnu-clang++", mainCc)))
+		if err := verifyArgCount(clangPlusPlusCmd, 1, "cppOnlyFlag"); err != nil {
+			t.Error(err)
+		}
+		// C++ only flags are disabled with -x.
+		clangPlusPlusWithXCmd := ctx.must(callCompiler(ctx, ctx.cfg,
+			ctx.newCommand("./x86_64-cros-linux-gnu-clang++", "-x", "c", mainCc)))
+		if err := verifyArgCount(clangPlusPlusWithXCmd, 0, "cppOnlyFlag"); err != nil {
+			t.Error(err)
+		}
+		// C++ only flags are disabled with " - " .
+		clangPlusPlusWithStdin := ctx.must(callCompiler(ctx, ctx.cfg,
+			ctx.newCommand("./x86_64-cros-linux-gnu-clang++", "-", mainCc)))
+		if err := verifyArgCount(clangPlusPlusWithStdin, 0, "cppOnlyFlag"); err != nil {
+			t.Error(err)
+		}
+	})
+}
+
 func TestClangPathGivenClangEnv(t *testing.T) {
 	withTestContext(t, func(ctx *testContext) {
 		ctx.env = []string{"CLANG=/a/b/clang"}
@@ -310,3 +340,18 @@ func TestClangLinkerPathRelativeToRootDir(t *testing.T) {
 		}
 	})
 }
+
+func TestFilterUnsupportedFlags(t *testing.T) {
+	withTestContext(t, func(ctx *testContext) {
+		cmd := ctx.must(callCompiler(ctx, ctx.cfg,
+			ctx.newCommand(clangX86_64, "-Xcompiler", mainCc)))
+		if err := verifyArgCount(cmd, 0, "-Xcompiler"); err != nil {
+			t.Error(err)
+		}
+		cmd = ctx.must(callCompiler(ctx, ctx.cfg,
+			ctx.newCommand(clangX86_64, "-avoid-version", mainCc)))
+		if err := verifyArgCount(cmd, 0, "-avoid-version"); err != nil {
+			t.Error(err)
+		}
+	})
+}