Skip to content

Commit c172e30

Browse files
Make builder unit tests pass in vscode image. (#32815)
vscode image defines more environment variables. Provide overrides for these variables in unit tests, so that they pass for vscode image as well and they do not get picked up from the system env. Co-authored-by: Andrei Litvin <andreilitvin@google.com>
1 parent e53dca8 commit c172e30

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

scripts/build/test.py

+2
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ def build_actual_output(root: str, out: str, args: List[str]) -> List[str]:
4949
'TI_SYSCONFIG_ROOT': 'TEST_TI_SYSCONFIG_ROOT',
5050
'JAVA_PATH': 'TEST_JAVA_PATH',
5151
'GSDK_ROOT': 'TEST_GSDK_ROOT',
52+
'WISECONNECT_SDK_ROOT': 'TEST_WISECONNECT_SDK_ROOT',
53+
'WIFI_SDK_ROOT': 'TEST_WIFI_SDK_ROOT',
5254
})
5355

5456
retval = subprocess.run([

scripts/build/testdata/dry_run_efr32-brd4161a-light-rpc-no-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
cd "{root}"
33

44
# Generating efr32-brd4161a-light-rpc-no-version
5-
gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/silabs '--args=silabs_board="BRD4161A" is_debug=false import("//with_pw_rpc.gni") efr32_sdk_root="TEST_GSDK_ROOT" openthread_root="TEST_GSDK_ROOT/util/third_party/openthread"' {out}/efr32-brd4161a-light-rpc-no-version
5+
gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/lighting-app/silabs '--args=silabs_board="BRD4161A" is_debug=false import("//with_pw_rpc.gni") efr32_sdk_root="TEST_GSDK_ROOT" openthread_root="TEST_GSDK_ROOT/util/third_party/openthread" wiseconnect_sdk_root="TEST_WISECONNECT_SDK_ROOT" wifi_sdk_root="TEST_WIFI_SDK_ROOT"' {out}/efr32-brd4161a-light-rpc-no-version
66

77
# Building efr32-brd4161a-light-rpc-no-version
88
ninja -C {out}/efr32-brd4161a-light-rpc-no-version

0 commit comments

Comments
 (0)