Skip to content

Commit

Permalink
Remove happy tests (#11373)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
andy31415 authored and pull[bot] committed Jan 10, 2024
1 parent 2766b0f commit 2253400
Show file tree
Hide file tree
Showing 32 changed files with 9 additions and 2,980 deletions.
15 changes: 2 additions & 13 deletions .github/workflows/unit_integration_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ jobs:
image: connectedhomeip/chip-build:0.5.28
volumes:
- "/tmp/log_output:/tmp/test_logs"
- "/tmp/happy_test_logs:/tmp/happy_test_logs"
options:
--privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1"

Expand All @@ -52,10 +51,7 @@ jobs:
- name: Bootstrap
timeout-minutes: 10
run: |
mkdir -p /tmp/happy_test_logs ;
mkdir -p /tmp/log_output ;
scripts/tests/happy_tests.sh install_packages ;
scripts/tests/happy_tests.sh bootstrap ;
scripts/build/gn_bootstrap.sh ;
- name: Uploading bootstrap logs
uses: actions/upload-artifact@v2
Expand All @@ -82,20 +78,13 @@ jobs:
*) ;;
esac
scripts/build/gn_gen.sh --args="$GN_ARGS chip_enable_happy_tests=true"
scripts/build/gn_gen.sh --args="$GN_ARGS"
- name: Run Build
timeout-minutes: 8
run: scripts/run_in_build_env.sh "ninja -C out/$BUILD_TYPE"
- name: Run Tests
timeout-minutes: 15
run: RUN_HAPPY_TESTS=1 scripts/tests/gn_tests.sh
- name: Uploading Happy Test Log
uses: actions/upload-artifact@v2
if: ${{ always() }} && ${{ !env.ACT }}
with:
name:
happy_log-${{ steps.outsuffix.outputs.value }}-${{ matrix.type }}
path: /tmp/happy_test_logs/
run: scripts/tests/gn_tests.sh
# TODO Log Upload https://github.com/project-chip/connectedhomeip/issues/2227
# TODO https://github.com/project-chip/connectedhomeip/issues/1512
# - name: Run Code Coverage
Expand Down
4 changes: 0 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,6 @@
path = third_party/cirque/repo
url = https://github.com/openweave/cirque.git
branch = master
[submodule "happy"]
path = third_party/happy/repo
url = https://github.com/openweave/happy.git
branch = master
[submodule "nanopb"]
path = third_party/nanopb/repo
url = https://github.com/nanopb/nanopb.git
Expand Down
10 changes: 0 additions & 10 deletions BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
"$dir_pw_watch/py",
"integrations/mobly:chip_mobly",
"scripts:requirements",
"third_party/happy",
]
}

Expand Down Expand Up @@ -163,15 +162,6 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
]
}
}

# We don't always want to run happy tests, make them a seperate group.
if (chip_enable_happy_tests) {
group("happy_tests") {
if (chip_link_tests) {
deps = [ "//src:happy_tests" ]
}
}
}
} else {
# This is the unified build. Configure various real toolchains.
import("${chip_root}/build/chip/chip_build.gni")
Expand Down
54 changes: 0 additions & 54 deletions build/chip/happy_test.gni

This file was deleted.

3 changes: 0 additions & 3 deletions build/chip/tests.gni
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@ import("${chip_root}/src/platform/device.gni")
declare_args() {
# Enable building tests.
chip_build_tests = current_os != "freertos"

# Enable happy tests.
chip_enable_happy_tests = false
}

declare_args() {
Expand Down
4 changes: 0 additions & 4 deletions scripts/tests/gn_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,3 @@ env
set -x

ninja -v -C "$CHIP_ROOT/out/$BUILD_TYPE" -k 0 check

if [ "x$RUN_HAPPY_TESTS" == "x1" ]; then
ninja -v -C "$CHIP_ROOT/out/$BUILD_TYPE" -k 0 happy_tests
fi
66 changes: 0 additions & 66 deletions scripts/tests/happy_test_wrapper.py

This file was deleted.

70 changes: 0 additions & 70 deletions scripts/tests/happy_tests.sh

This file was deleted.

8 changes: 0 additions & 8 deletions src/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -125,14 +125,6 @@ if (chip_build_tests) {
}
}

if (chip_enable_happy_tests) {
group("happy_tests") {
deps = [
"${chip_root}/src/test_driver/happy/tests/standalone/inet:inet_tests",
]
}
}

chip_test_group("fake_platform_tests") {
deps = [ "${chip_root}/src/lib/dnssd/platform/tests" ]
}
Expand Down
20 changes: 0 additions & 20 deletions src/inet/tests/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -86,23 +86,3 @@ chip_test_suite("tests") {
sources += [ "TestLwIPDNS.cpp" ]
}
}

if (chip_enable_happy_tests) {
# The following binaries should be executed by happy.
chip_test_suite("happy_tests") {
output_name = "libHappyTestInetCommon"

sources = [ "TestInetLayerMulticast.cpp" ]

public_configs = [ ":tests_config" ]

public_deps = [
":tests_lib",
"${chip_root}/src/inet",
"${chip_root}/src/lib/core",
"${nlunit_test_root}:nlunit-test",
]

tests = [ "TestInetLayerMulticast" ]
}
}
Loading

0 comments on commit 2253400

Please sign in to comment.