Switch to gcc builds

project-chip · Jul 12, 2022 · 1086416 · 1086416
1 parent ed4c3ec
commit 1086416
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/scripts/build/build/targets.py b/scripts/build/build/targets.py
@@ -295,8 +295,8 @@ def HostTargets():
         yield target
 
     # limited subset for coverage
-    yield target_native.Extend('all-clusters-clang-coverage', app=HostApp.ALL_CLUSTERS, use_clang=True, use_coverage=True)
-    yield target_native.Extend('chip-tool-clang-coverage', app=HostApp.CHIP_TOOL, use_clang=True, use_coverage=True)
+    yield target_native.Extend('all-clusters-coverage', app=HostApp.ALL_CLUSTERS, use_coverage=True)
+    yield target_native.Extend('chip-tool-coverage', app=HostApp.CHIP_TOOL, use_coverage=True)
 
     # Without extra build variants
     yield target_native.Extend('chip-cert', app=HostApp.CERT_TOOL)
@@ -309,8 +309,8 @@ def HostTargets():
                                use_platform_mdns=True, enable_ipv4=False).GlobBlacklist("Reduce default build variants")
 
     yield target_native.Extend('tests', app=HostApp.TESTS)
+    yield target_native.Extend('tests-coverage', app=HostApp.TESTS, use_coverage=True)
     yield target_native.Extend('tests-clang', app=HostApp.TESTS, use_clang=True)
-    yield target_native.Extend('tests-clang-coverage', app=HostApp.TESTS, use_clang=True, use_coverage=True)
 
     test_target = Target(HostBoard.NATIVE.PlatformName(), HostBuilder)
     yield test_target.Extend(HostBoard.FAKE.BoardName() + '-tests', board=HostBoard.FAKE, app=HostApp.TESTS)

diff --git a/scripts/build/testdata/build_linux_on_x64.txt b/scripts/build/testdata/build_linux_on_x64.txt
@@ -181,8 +181,8 @@ gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/exa
 # Generating linux-x64-all-clusters-app-nodeps-ipv6only
 gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/all-clusters-app/linux '--args=chip_inet_config_enable_ipv4=false chip_config_network_layer_ble=false chip_enable_wifi=false chip_enable_openthread=false is_clang=true' {out}/linux-x64-all-clusters-app-nodeps-ipv6only
 
-# Generating linux-x64-all-clusters-clang-coverage
-gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/all-clusters-app/linux '--args=use_coverage=true is_clang=true' {out}/linux-x64-all-clusters-clang-coverage
+# Generating linux-x64-all-clusters-coverage
+gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/all-clusters-app/linux --args=use_coverage=true {out}/linux-x64-all-clusters-coverage
 
 # Generating linux-x64-all-clusters-ipv6only
 gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/all-clusters-app/linux --args=chip_inet_config_enable_ipv4=false {out}/linux-x64-all-clusters-ipv6only
@@ -205,8 +205,8 @@ gn gen --check --fail-on-unused-args --export-compile-commands --root={root} '--
 # Generating linux-x64-chip-tool
 gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/chip-tool {out}/linux-x64-chip-tool
 
-# Generating linux-x64-chip-tool-clang-coverage
-gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/chip-tool '--args=use_coverage=true is_clang=true' {out}/linux-x64-chip-tool-clang-coverage
+# Generating linux-x64-chip-tool-coverage
+gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/chip-tool --args=use_coverage=true {out}/linux-x64-chip-tool-coverage
 
 # Generating linux-x64-chip-tool-ipv6only
 gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/chip-tool --args=chip_inet_config_enable_ipv4=false {out}/linux-x64-chip-tool-ipv6only
@@ -274,8 +274,8 @@ gn gen --check --fail-on-unused-args --export-compile-commands --root={root} --a
 # Generating linux-x64-tests-clang
 gn gen --check --fail-on-unused-args --export-compile-commands --root={root} '--args=is_clang=true chip_build_tests=true' {out}/linux-x64-tests-clang
 
-# Generating linux-x64-tests-clang-coverage
-gn gen --check --fail-on-unused-args --export-compile-commands --root={root} '--args=use_coverage=true is_clang=true chip_build_tests=true' {out}/linux-x64-tests-clang-coverage
+# Generating linux-x64-tests-coverage
+gn gen --check --fail-on-unused-args --export-compile-commands --root={root} '--args=use_coverage=true chip_build_tests=true' {out}/linux-x64-tests-coverage
 
 # Generating linux-x64-thermostat
 gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/thermostat/linux {out}/linux-x64-thermostat
@@ -409,8 +409,8 @@ ninja -C {out}/linux-x64-all-clusters-app-nodeps
 # Building linux-x64-all-clusters-app-nodeps-ipv6only
 ninja -C {out}/linux-x64-all-clusters-app-nodeps-ipv6only
 
-# Building linux-x64-all-clusters-clang-coverage
-ninja -C {out}/linux-x64-all-clusters-clang-coverage
+# Building linux-x64-all-clusters-coverage
+ninja -C {out}/linux-x64-all-clusters-coverage
 
 # Building linux-x64-all-clusters-ipv6only
 ninja -C {out}/linux-x64-all-clusters-ipv6only
@@ -433,8 +433,8 @@ ninja -C {out}/linux-x64-chip-cert src/tools/chip-cert
 # Building linux-x64-chip-tool
 ninja -C {out}/linux-x64-chip-tool
 
-# Building linux-x64-chip-tool-clang-coverage
-ninja -C {out}/linux-x64-chip-tool-clang-coverage
+# Building linux-x64-chip-tool-coverage
+ninja -C {out}/linux-x64-chip-tool-coverage
 
 # Building linux-x64-chip-tool-ipv6only
 ninja -C {out}/linux-x64-chip-tool-ipv6only
@@ -502,8 +502,8 @@ ninja -C {out}/linux-x64-tests check
 # Building linux-x64-tests-clang
 ninja -C {out}/linux-x64-tests-clang check
 
-# Building linux-x64-tests-clang-coverage
-ninja -C {out}/linux-x64-tests-clang-coverage check
+# Building linux-x64-tests-coverage
+ninja -C {out}/linux-x64-tests-coverage check
 
 # Building linux-x64-thermostat
 ninja -C {out}/linux-x64-thermostat