Skip to content

Commit e893a32

Browse files
authored
Split REPL app build steps and clean the out directory (#39741)
* First change * update the other targets * reindent * More cleanup for smaller changes * Minor edit to remove more delta * More text updates * Remove extra comment * Fix some hard coded paths. python_testing paths are just wrong overall ... so changed the hardcode there
1 parent 6cfcdd5 commit e893a32

File tree

9 files changed

+200
-90
lines changed

9 files changed

+200
-90
lines changed

.github/workflows/tests.yaml

Lines changed: 191 additions & 81 deletions
Large diffs are not rendered by default.

src/python_testing/TC_DA_1_9.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
# script-args: >
3535
# --storage-path admin_storage.json
3636
# --PICS src/app/tests/suites/certification/ci-pics-values
37-
# --string-arg app_path:out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app
37+
# --string-arg app_path:${ALL_CLUSTERS_APP}
3838
# --string-arg dac_provider_base_path:credentials/test/revoked-attestation-certificates/dac-provider-test-vectors
3939
# --string-arg revocation_set_base_path:credentials/test/revoked-attestation-certificates/revocation-sets
4040
# --string-arg app_log_path:/tmp/TC_DA_1_9
@@ -68,7 +68,7 @@ def setup_class(self):
6868
if self.is_pics_sdk_ci_only:
6969
ROOT_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), '../..'))
7070
DEFAULT_APP_PATH = os.path.join(
71-
ROOT_DIR, "out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app")
71+
ROOT_DIR, "objdir-clone/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app")
7272
else:
7373
ROOT_DIR = "/root"
7474
DEFAULT_APP_PATH = os.path.join(ROOT_DIR, "apps/chip-all-clusters-app")

src/python_testing/TC_SC_3_5.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
# factory-reset: true
2121
# quiet: true
2222
# script-args: >
23-
# --string-arg th_server_app_path:out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app
23+
# --string-arg th_server_app_path:${ALL_CLUSTERS_APP}
2424
# --storage-path admin_storage.json
2525
# --trace-to json:${TRACE_TEST_JSON}.json
2626
# --trace-to perfetto:${TRACE_TEST_PERFETTO}.perfetto

src/python_testing/TC_WEBRTCR_2_1.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
# script-args: >
2525
# --PICS src/app/tests/suites/certification/ci-pics-values
2626
# --storage-path admin_storage.json
27-
# --string-arg th_server_app_path:out/linux-x64-camera/chip-camera-app
27+
# --string-arg th_server_app_path:${CAMERA_APP}
2828
# --trace-to json:${TRACE_TEST_JSON}.json
2929
# --trace-to perfetto:${TRACE_TEST_PERFETTO}.perfetto
3030
# factory-reset: true

src/python_testing/TC_WEBRTCR_2_2.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
# script-args: >
2525
# --PICS src/app/tests/suites/certification/ci-pics-values
2626
# --storage-path admin_storage.json
27-
# --string-arg th_server_app_path:out/linux-x64-camera/chip-camera-app
27+
# --string-arg th_server_app_path:${CAMERA_APP}
2828
# --trace-to json:${TRACE_TEST_JSON}.json
2929
# --trace-to perfetto:${TRACE_TEST_PERFETTO}.perfetto
3030
# factory-reset: true

src/python_testing/TC_WEBRTCR_2_3.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
# script-args: >
2727
# --PICS src/app/tests/suites/certification/ci-pics-values
2828
# --storage-path admin_storage.json
29-
# --string-arg th_server_app_path:out/linux-x64-camera/chip-camera-app
29+
# --string-arg th_server_app_path:${CAMERA_APP}
3030
# --trace-to json:${TRACE_TEST_JSON}.json
3131
# --trace-to perfetto:${TRACE_TEST_PERFETTO}.perfetto
3232
# factory-reset: true

src/python_testing/TC_WEBRTCR_2_4.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
# script-args: >
2727
# --PICS src/app/tests/suites/certification/ci-pics-values
2828
# --storage-path admin_storage.json
29-
# --string-arg th_server_app_path:out/linux-x64-camera/chip-camera-app
29+
# --string-arg th_server_app_path:${CAMERA_APP}
3030
# --trace-to json:${TRACE_TEST_JSON}.json
3131
# --trace-to perfetto:${TRACE_TEST_PERFETTO}.perfetto
3232
# factory-reset: true

src/python_testing/test_testing/test_TC_DA_1_2.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def run_single_test(dac_provider: str, product_id: int, factory_reset: bool = Fa
3333
reset = ' --factory-reset'
3434

3535
app = os.path.join(
36-
CHIP_ROOT, 'out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app')
36+
CHIP_ROOT, 'objdir-clone/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app')
3737

3838
# Certs in the commissioner_dut directory use 0x8000 as the PID
3939
app_args = '--discriminator 1234 --KVS kvs1 --product-id ' + \

src/python_testing/test_testing/test_TC_DA_1_5.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def run_single_test(flag: str, factory_reset: bool = False) -> int:
2929
if factory_reset:
3030
reset = ' --factory-reset'
3131

32-
app = os.path.join(CHIP_ROOT, 'out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app')
32+
app = os.path.join(CHIP_ROOT, 'objdir-clone/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app')
3333

3434
# Certs in the commissioner_dut directory use 0x8000 as the PID
3535
app_args = '--discriminator 1234 --KVS kvs1 ' + flag

0 commit comments

Comments
 (0)