StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add -std user flags to cc test to ensure order

Browse Source 
Test: go test soong tests
Change-Id: Iff2b82f59e138089d1c1726d9b51e040b00340ba
This commit is contained in:
Liz Kammer
2021-12-16 11:38:50 -05:00
parent cf7961200b
commit 9dc6577d55
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cc/cc_test.go
View File

@@ -3980,9 +3980,9 @@ func TestIncludeDirectoryOrdering(t *testing.T) {
conly := []string{"-fPIC", "${config.CommonGlobalConlyflags}"} conly := []string{"-fPIC", "${config.CommonGlobalConlyflags}"}
cppOnly := []string{"-fPIC", "${config.CommonGlobalCppflags}", "${config.DeviceGlobalCppflags}", "${config.ArmCppflags}"} cppOnly := []string{"-fPIC", "${config.CommonGlobalCppflags}", "${config.DeviceGlobalCppflags}", "${config.ArmCppflags}"}
cflags := []string{"-Wall", "-Werror"} cflags := []string{"-Wall", "-Werror", "-std=candcpp"}
cstd := []string{"-std=gnu99"} cstd := []string{"-std=gnu99", "-std=conly"}
cppstd := []string{"-std=gnu++17", "-fno-rtti"} cppstd := []string{"-std=gnu++17", "-std=cpp", "-fno-rtti"}
lastIncludes := []string{ lastIncludes := []string{
"out/soong/ndk/sysroot/usr/include", "out/soong/ndk/sysroot/usr/include",
@@ -4025,6 +4025,9 @@ func TestIncludeDirectoryOrdering(t *testing.T) {
cc_library { cc_library {
name: "libfoo", name: "libfoo",
srcs: ["%s"], srcs: ["%s"],
cflags: ["-std=candcpp"],
conlyflags: ["-std=conly"],
cppflags: ["-std=cpp"],
local_include_dirs: ["local_include_dirs"], local_include_dirs: ["local_include_dirs"],
export_include_dirs: ["export_include_dirs"], export_include_dirs: ["export_include_dirs"],
export_system_include_dirs: ["export_system_include_dirs"], export_system_include_dirs: ["export_system_include_dirs"],