diff options
Diffstat (limited to 'compiler_wrapper/testdata/cros_clang_host_golden')
9 files changed, 246 insertions, 60 deletions
diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json b/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json index cc55bc4f..1c2e5a0e 100644 --- a/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json +++ b/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json @@ -36,9 +36,12 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ], "env_updates": [ "PYTHONPATH=/somepath/test_binary" @@ -85,9 +88,12 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ], "env_updates": [ "PYTHONPATH=/somepath/test_binary" @@ -137,9 +143,12 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ], "env_updates": [ "PYTHONPATH=/somepath/test_binary" diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/clang_ftrapv_maincc_target_specific.json b/compiler_wrapper/testdata/cros_clang_host_golden/clang_ftrapv_maincc_target_specific.json index 5a59277c..ec57b0d7 100644 --- a/compiler_wrapper/testdata/cros_clang_host_golden/clang_ftrapv_maincc_target_specific.json +++ b/compiler_wrapper/testdata/cros_clang_host_golden/clang_ftrapv_maincc_target_specific.json @@ -27,9 +27,12 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } } @@ -63,9 +66,12 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } } @@ -99,9 +105,12 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } } @@ -135,9 +144,12 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } } @@ -171,9 +183,12 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } } @@ -207,9 +222,12 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } } @@ -243,9 +261,12 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } } @@ -279,9 +300,12 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } } @@ -315,9 +339,12 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } } diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/clang_host_wrapper.json b/compiler_wrapper/testdata/cros_clang_host_golden/clang_host_wrapper.json index 44b2fb91..99c12725 100644 --- a/compiler_wrapper/testdata/cros_clang_host_golden/clang_host_wrapper.json +++ b/compiler_wrapper/testdata/cros_clang_host_golden/clang_host_wrapper.json @@ -26,9 +26,12 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } } diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/clang_maincc_target_specific.json b/compiler_wrapper/testdata/cros_clang_host_golden/clang_maincc_target_specific.json index 0b951f3e..9389a4d8 100644 --- a/compiler_wrapper/testdata/cros_clang_host_golden/clang_maincc_target_specific.json +++ b/compiler_wrapper/testdata/cros_clang_host_golden/clang_maincc_target_specific.json @@ -26,9 +26,12 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } } @@ -61,9 +64,12 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } } @@ -96,9 +102,12 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } } @@ -131,9 +140,12 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } } @@ -166,9 +178,12 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } } @@ -201,9 +216,12 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } } @@ -236,9 +254,12 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } } @@ -271,9 +292,12 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } } @@ -306,9 +330,12 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } } diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/clang_path.json b/compiler_wrapper/testdata/cros_clang_host_golden/clang_path.json index 69fb4410..080f1d48 100644 --- a/compiler_wrapper/testdata/cros_clang_host_golden/clang_path.json +++ b/compiler_wrapper/testdata/cros_clang_host_golden/clang_path.json @@ -26,9 +26,12 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } } @@ -64,9 +67,12 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] }, "stdout": "somemessage", @@ -102,9 +108,12 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } } @@ -140,9 +149,12 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } } @@ -185,11 +197,14 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-resource-dir=someResourceDir", "--gcc-toolchain=/usr", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } } @@ -235,11 +250,14 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-resource-dir=someResourceDir", "--gcc-toolchain=/usr", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } } @@ -285,11 +303,14 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-resource-dir=someResourceDir", "--gcc-toolchain=/usr", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] }, "stdout": "somemessage", @@ -325,9 +346,12 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } } @@ -360,9 +384,12 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } } @@ -395,9 +422,12 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } } @@ -430,9 +460,12 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } } @@ -468,9 +501,12 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } } diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/clang_sanitizer_args.json b/compiler_wrapper/testdata/cros_clang_host_golden/clang_sanitizer_args.json index 93e566fe..0aeb2362 100644 --- a/compiler_wrapper/testdata/cros_clang_host_golden/clang_sanitizer_args.json +++ b/compiler_wrapper/testdata/cros_clang_host_golden/clang_sanitizer_args.json @@ -28,10 +28,13 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fsanitize=kernel-address", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } } @@ -66,10 +69,13 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fsanitize=kernel-address", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } } @@ -104,10 +110,13 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fsanitize=kernel-address", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } } @@ -142,10 +151,13 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fsanitize=kernel-address", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } } @@ -179,11 +191,14 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fno-experimental-new-pass-manager", "-fsanitize=fuzzer", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } } @@ -218,12 +233,15 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fno-experimental-new-pass-manager", "-fsanitize=address", "-fprofile-instr-generate", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } } @@ -257,10 +275,13 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fsanitize=address", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } } @@ -294,10 +315,13 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fprofile-instr-generate", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } } diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/clang_specific_args.json b/compiler_wrapper/testdata/cros_clang_host_golden/clang_specific_args.json index 41143bf0..bddb110e 100644 --- a/compiler_wrapper/testdata/cros_clang_host_golden/clang_specific_args.json +++ b/compiler_wrapper/testdata/cros_clang_host_golden/clang_specific_args.json @@ -37,6 +37,7 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-mno-movbe", "-Wclobbered", @@ -47,7 +48,9 @@ "-Woverride-init", "-Wunsafe-loop-optimizations", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } } @@ -81,10 +84,13 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-Wno-#warnings", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } } @@ -118,10 +124,13 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-Wno-error=uninitialized", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } } @@ -155,10 +164,13 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-Wno-error=unused-variable", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } } @@ -192,10 +204,13 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-Wno-unused-variable", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } } @@ -229,10 +244,13 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-Wunused-variable", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } } @@ -266,10 +284,13 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-someflag", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } } diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/clangtidy.json b/compiler_wrapper/testdata/cros_clang_host_golden/clangtidy.json index c4f86b01..89e4c6f3 100644 --- a/compiler_wrapper/testdata/cros_clang_host_golden/clangtidy.json +++ b/compiler_wrapper/testdata/cros_clang_host_golden/clangtidy.json @@ -42,9 +42,12 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } }, @@ -64,9 +67,12 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } } @@ -116,9 +122,12 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } }, @@ -138,9 +147,12 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } } @@ -192,9 +204,12 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] }, "stdout": "somemessage", @@ -217,9 +232,12 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } } @@ -272,9 +290,12 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } }, @@ -294,9 +315,12 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] }, "stdout": "somemessage", diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/force_disable_werror.json b/compiler_wrapper/testdata/cros_clang_host_golden/force_disable_werror.json index 272b4220..75f5e474 100644 --- a/compiler_wrapper/testdata/cros_clang_host_golden/force_disable_werror.json +++ b/compiler_wrapper/testdata/cros_clang_host_golden/force_disable_werror.json @@ -29,9 +29,12 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] } } @@ -67,9 +70,12 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] }, "stderr": "-Werror originalerror", @@ -91,9 +97,12 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation", "-Wno-error", "-Wno-error=poison-system-directories" ] @@ -133,9 +142,12 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", - "-Wno-implicit-int-float-conversion" + "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation" ] }, "stderr": "-Werror originalerror", @@ -157,9 +169,12 @@ "-Werror=poison-system-directories", "-Wno-unknown-warning-option", "-fexperimental-new-pass-manager", + "-Wno-compound-token-split-by-macro", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "main.cc", "-Wno-implicit-int-float-conversion", + "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation", "-Wno-error", "-Wno-error=poison-system-directories" ] |