Skip to content
This repository was archived by the owner on Dec 20, 2023. It is now read-only.

Commit 0f9f23c

Browse files
author
Allen Shih
committed
rebase from master
1 parent b4a20f7 commit 0f9f23c

File tree

2 files changed

+3
-12
lines changed

2 files changed

+3
-12
lines changed

src/test-apps/Makefile.am

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1089,7 +1089,6 @@ if WEAVE_RUN_HAPPY_PAIRING
10891089
if CONFIG_NETWORK_LAYER_BLE
10901090
if CONFIG_BLE_PLATFORM_BLUEZ
10911091
check_SCRIPTS += \
1092-
happy/tests/standalone/pairing/test_weave_ble_01.py \
10931092
$(NULL)
10941093
endif # CONFIG_BLE_PLATFORM_BLUEZ
10951094
endif # CONFIG_NETWORK_LAYER_BLE

src/test-apps/Makefile.in

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -571,7 +571,6 @@ target_triplet = @target@
571571
@WEAVE_BUILD_TESTS_TRUE@@WEAVE_RUN_HAPPY_PAIRING_TRUE@@WEAVE_RUN_HAPPY_SERVICE_FALSE@@WEAVE_RUN_HAPPY_TRUE@ $(NULL)
572572

573573
@CONFIG_BLE_PLATFORM_BLUEZ_TRUE@@CONFIG_NETWORK_LAYER_BLE_TRUE@@WEAVE_BUILD_TESTS_TRUE@@WEAVE_RUN_HAPPY_PAIRING_TRUE@@WEAVE_RUN_HAPPY_SERVICE_FALSE@@WEAVE_RUN_HAPPY_TRUE@am__append_39 = \
574-
@CONFIG_BLE_PLATFORM_BLUEZ_TRUE@@CONFIG_NETWORK_LAYER_BLE_TRUE@@WEAVE_BUILD_TESTS_TRUE@@WEAVE_RUN_HAPPY_PAIRING_TRUE@@WEAVE_RUN_HAPPY_SERVICE_FALSE@@WEAVE_RUN_HAPPY_TRUE@ happy/tests/standalone/pairing/test_weave_ble_01.py \
575574
@CONFIG_BLE_PLATFORM_BLUEZ_TRUE@@CONFIG_NETWORK_LAYER_BLE_TRUE@@WEAVE_BUILD_TESTS_TRUE@@WEAVE_RUN_HAPPY_PAIRING_TRUE@@WEAVE_RUN_HAPPY_SERVICE_FALSE@@WEAVE_RUN_HAPPY_TRUE@ $(NULL)
576575

577576
@WEAVE_BUILD_TESTS_TRUE@@WEAVE_RUN_HAPPY_SERVICEDIR_TRUE@@WEAVE_RUN_HAPPY_SERVICE_FALSE@@WEAVE_RUN_HAPPY_TRUE@am__append_40 = \
@@ -2454,7 +2453,7 @@ RECHECK_LOGS = $(TEST_LOGS)
24542453
@WEAVE_BUILD_TESTS_TRUE@@WEAVE_RUN_HAPPY_SERVICE_FALSE@@WEAVE_RUN_HAPPY_TRUE@@WEAVE_RUN_HAPPY_TUNNEL_TRUE@ happy/tests/standalone/con_tunnel/test_weave_con_tunnel_01.py
24552454
@WEAVE_BUILD_TESTS_TRUE@@WEAVE_RUN_HAPPY_KEY_EXPORT_TRUE@@WEAVE_RUN_HAPPY_SERVICE_FALSE@@WEAVE_RUN_HAPPY_TRUE@am__EXEEXT_32 = happy/tests/standalone/key_export/test_weave_key_export_01.py
24562455
@WEAVE_BUILD_TESTS_TRUE@@WEAVE_RUN_HAPPY_PAIRING_TRUE@@WEAVE_RUN_HAPPY_SERVICE_FALSE@@WEAVE_RUN_HAPPY_TRUE@am__EXEEXT_33 = happy/tests/standalone/pairing/test_weave_pairing_01.py
2457-
@CONFIG_BLE_PLATFORM_BLUEZ_TRUE@@CONFIG_NETWORK_LAYER_BLE_TRUE@@WEAVE_BUILD_TESTS_TRUE@@WEAVE_RUN_HAPPY_PAIRING_TRUE@@WEAVE_RUN_HAPPY_SERVICE_FALSE@@WEAVE_RUN_HAPPY_TRUE@am__EXEEXT_34 = happy/tests/standalone/pairing/test_weave_ble_01.py
2456+
am__EXEEXT_34 =
24582457
@WEAVE_BUILD_TESTS_TRUE@@WEAVE_RUN_HAPPY_SERVICEDIR_TRUE@@WEAVE_RUN_HAPPY_SERVICE_FALSE@@WEAVE_RUN_HAPPY_TRUE@am__EXEEXT_35 = happy/tests/standalone/servicedir/test_service_directory_01.py
24592458
@WEAVE_BUILD_TESTS_TRUE@@WEAVE_RUN_HAPPY_SERVICE_FALSE@@WEAVE_RUN_HAPPY_TIME_TRUE@@WEAVE_RUN_HAPPY_TRUE@am__EXEEXT_36 = happy/tests/standalone/time/test_weave_time_local.sh \
24602459
@WEAVE_BUILD_TESTS_TRUE@@WEAVE_RUN_HAPPY_SERVICE_FALSE@@WEAVE_RUN_HAPPY_TIME_TRUE@@WEAVE_RUN_HAPPY_TRUE@ happy/tests/standalone/time/test_weave_time_service.sh \
@@ -8397,13 +8396,6 @@ happy/tests/standalone/pairing/test_weave_pairing_01.py.log: happy/tests/standal
83978396
--log-file $$b.log --trs-file $$b.trs \
83988397
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
83998398
"$$tst" $(AM_TESTS_FD_REDIRECT)
8400-
happy/tests/standalone/pairing/test_weave_ble_01.py.log: happy/tests/standalone/pairing/test_weave_ble_01.py
8401-
@p='happy/tests/standalone/pairing/test_weave_ble_01.py'; \
8402-
b='happy/tests/standalone/pairing/test_weave_ble_01.py'; \
8403-
$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
8404-
--log-file $$b.log --trs-file $$b.trs \
8405-
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
8406-
"$$tst" $(AM_TESTS_FD_REDIRECT)
84078399
happy/tests/standalone/servicedir/test_service_directory_01.py.log: happy/tests/standalone/servicedir/test_service_directory_01.py
84088400
@p='happy/tests/standalone/servicedir/test_service_directory_01.py'; \
84098401
b='happy/tests/standalone/servicedir/test_service_directory_01.py'; \
@@ -8626,11 +8618,11 @@ distclean-generic:
86268618
maintainer-clean-generic:
86278619
@echo "This command is intended for maintainers to use"
86288620
@echo "it deletes files that may require special tools to rebuild."
8629-
@WEAVE_BUILD_TESTS_FALSE@uninstall-local:
8630-
@WEAVE_BUILD_TESTS_FALSE@install-exec-local:
86318621
@WEAVE_BUILD_COVERAGE_FALSE@clean-local:
86328622
@WEAVE_BUILD_COVERAGE_REPORTS_FALSE@clean-local:
86338623
@WEAVE_BUILD_TESTS_FALSE@clean-local:
8624+
@WEAVE_BUILD_TESTS_FALSE@install-exec-local:
8625+
@WEAVE_BUILD_TESTS_FALSE@uninstall-local:
86348626
clean: clean-recursive
86358627

86368628
clean-am: clean-checkPROGRAMS clean-generic clean-libexecPROGRAMS \

0 commit comments

Comments
 (0)