Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove happy tests #11373

Merged
merged 16 commits into from
Nov 18, 2021
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 1 addition & 12 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.23
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: 5
run: scripts/build/gn_build.sh
- name: Run Tests
timeout-minutes: 10
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/
# 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
8 changes: 0 additions & 8 deletions src/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -113,14 +113,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