Skip to content

Commit 229e18e

Browse files
andy31415pull[bot]
authored andcommitted
Remove happy tests (#11373)
* Remove happy test references from build system and test driver * Remove happy submodule * Remove test that can only run when using happy * Remove more happy usages from buiuld.gn and workflow scripts * remove happy from gni * Restyle fixes * Remove one more run happy tests variable * Enable dnssd for darwin only for now * whitespace update to kick the build * Restyle fixes * undo unintended changes to third party repos * Fix typo * Remove more happy specific scripts
1 parent 6493d91 commit 229e18e

32 files changed

+9
-2980
lines changed

.github/workflows/unit_integration_test.yaml

+2-13
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ jobs:
4040
image: connectedhomeip/chip-build:0.5.28
4141
volumes:
4242
- "/tmp/log_output:/tmp/test_logs"
43-
- "/tmp/happy_test_logs:/tmp/happy_test_logs"
4443
options:
4544
--privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1"
4645

@@ -52,10 +51,7 @@ jobs:
5251
- name: Bootstrap
5352
timeout-minutes: 10
5453
run: |
55-
mkdir -p /tmp/happy_test_logs ;
5654
mkdir -p /tmp/log_output ;
57-
scripts/tests/happy_tests.sh install_packages ;
58-
scripts/tests/happy_tests.sh bootstrap ;
5955
scripts/build/gn_bootstrap.sh ;
6056
- name: Uploading bootstrap logs
6157
uses: actions/upload-artifact@v2
@@ -82,20 +78,13 @@ jobs:
8278
*) ;;
8379
esac
8480
85-
scripts/build/gn_gen.sh --args="$GN_ARGS chip_enable_happy_tests=true"
81+
scripts/build/gn_gen.sh --args="$GN_ARGS"
8682
- name: Run Build
8783
timeout-minutes: 8
8884
run: scripts/run_in_build_env.sh "ninja -C out/$BUILD_TYPE"
8985
- name: Run Tests
9086
timeout-minutes: 15
91-
run: RUN_HAPPY_TESTS=1 scripts/tests/gn_tests.sh
92-
- name: Uploading Happy Test Log
93-
uses: actions/upload-artifact@v2
94-
if: ${{ always() }} && ${{ !env.ACT }}
95-
with:
96-
name:
97-
happy_log-${{ steps.outsuffix.outputs.value }}-${{ matrix.type }}
98-
path: /tmp/happy_test_logs/
87+
run: scripts/tests/gn_tests.sh
9988
# TODO Log Upload https://github.com/project-chip/connectedhomeip/issues/2227
10089
# TODO https://github.com/project-chip/connectedhomeip/issues/1512
10190
# - name: Run Code Coverage

.gitmodules

-4
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,6 @@
4646
path = third_party/cirque/repo
4747
url = https://github.com/openweave/cirque.git
4848
branch = master
49-
[submodule "happy"]
50-
path = third_party/happy/repo
51-
url = https://github.com/openweave/happy.git
52-
branch = master
5349
[submodule "nanopb"]
5450
path = third_party/nanopb/repo
5551
url = https://github.com/nanopb/nanopb.git

BUILD.gn

-10
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
5757
"$dir_pw_watch/py",
5858
"integrations/mobly:chip_mobly",
5959
"scripts:requirements",
60-
"third_party/happy",
6160
]
6261
}
6362

@@ -163,15 +162,6 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
163162
]
164163
}
165164
}
166-
167-
# We don't always want to run happy tests, make them a seperate group.
168-
if (chip_enable_happy_tests) {
169-
group("happy_tests") {
170-
if (chip_link_tests) {
171-
deps = [ "//src:happy_tests" ]
172-
}
173-
}
174-
}
175165
} else {
176166
# This is the unified build. Configure various real toolchains.
177167
import("${chip_root}/build/chip/chip_build.gni")

build/chip/happy_test.gni

-54
This file was deleted.

build/chip/tests.gni

-3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ import("${chip_root}/src/platform/device.gni")
2020
declare_args() {
2121
# Enable building tests.
2222
chip_build_tests = current_os != "freertos"
23-
24-
# Enable happy tests.
25-
chip_enable_happy_tests = false
2623
}
2724

2825
declare_args() {

scripts/tests/gn_tests.sh

-4
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,3 @@ env
3636
set -x
3737

3838
ninja -v -C "$CHIP_ROOT/out/$BUILD_TYPE" -k 0 check
39-
40-
if [ "x$RUN_HAPPY_TESTS" == "x1" ]; then
41-
ninja -v -C "$CHIP_ROOT/out/$BUILD_TYPE" -k 0 happy_tests
42-
fi

scripts/tests/happy_test_wrapper.py

-66
This file was deleted.

scripts/tests/happy_tests.sh

-70
This file was deleted.

src/BUILD.gn

-8
Original file line numberDiff line numberDiff line change
@@ -125,14 +125,6 @@ if (chip_build_tests) {
125125
}
126126
}
127127

128-
if (chip_enable_happy_tests) {
129-
group("happy_tests") {
130-
deps = [
131-
"${chip_root}/src/test_driver/happy/tests/standalone/inet:inet_tests",
132-
]
133-
}
134-
}
135-
136128
chip_test_group("fake_platform_tests") {
137129
deps = [ "${chip_root}/src/lib/dnssd/platform/tests" ]
138130
}

src/inet/tests/BUILD.gn

-20
Original file line numberDiff line numberDiff line change
@@ -86,23 +86,3 @@ chip_test_suite("tests") {
8686
sources += [ "TestLwIPDNS.cpp" ]
8787
}
8888
}
89-
90-
if (chip_enable_happy_tests) {
91-
# The following binaries should be executed by happy.
92-
chip_test_suite("happy_tests") {
93-
output_name = "libHappyTestInetCommon"
94-
95-
sources = [ "TestInetLayerMulticast.cpp" ]
96-
97-
public_configs = [ ":tests_config" ]
98-
99-
public_deps = [
100-
":tests_lib",
101-
"${chip_root}/src/inet",
102-
"${chip_root}/src/lib/core",
103-
"${nlunit_test_root}:nlunit-test",
104-
]
105-
106-
tests = [ "TestInetLayerMulticast" ]
107-
}
108-
}

0 commit comments

Comments
 (0)