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

Restyle Allow UDP listening port selection for Android #19690

Closed
wants to merge 22 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
6a0970c
Output information about what's being broadcast
gmarcosb Oct 18, 2021
9f094a3
Merge branch 'project-chip:master' into master
gmarcosb Jun 13, 2022
4be3a9d
Allow UDP listening port selection for Android
gmarcosb Jun 14, 2022
9acc410
Allow UDP listening port selection for Android
gmarcosb Jun 14, 2022
51241c3
Allow UDP listening port selection for Android
gmarcosb Jun 14, 2022
c8dd752
Restyled by whitespace
restyled-commits Jun 14, 2022
1fabce6
Restyled by google-java-format
restyled-commits Jun 14, 2022
6bd2ebf
Restyled by clang-format
restyled-commits Jun 14, 2022
6434565
Restyled by gn
restyled-commits Jun 14, 2022
65e546a
Restyled by google-java-format
restyled-commits Jun 16, 2022
cb792b8
Merge branch 'master' into 14542_changes
andy31415 Jun 16, 2022
332cde2
Revert attempted log in QueryResponder.cpp - more work needed, likely…
andy31415 Jun 16, 2022
d37a5cd
Convert the chip port to a constant, move 5543 to 5540 since that see…
andy31415 Jun 16, 2022
15639cf
Expose/promote QNameString in Logging to allow other logging location…
gmarcosb Jun 16, 2022
69ab510
Expose a public default ctor for backwards compatibility with existin…
gmarcosb Jun 16, 2022
1135ebb
Merge remote-tracking branch 'origin/14542_changes' into 14542_changes
gmarcosb Jun 16, 2022
6bbaa11
Revert inadvertent build_overrides/pigweed_environment.gni
gmarcosb Jun 16, 2022
4fb736a
Manual conflict resolution for merge branch 'master' of https://githu…
gmarcosb Jun 22, 2022
93231e7
Merge branch 'master' of https://github.com/project-chip/connectedhom…
gmarcosb Jun 22, 2022
813574a
Restyled by google-java-format
restyled-commits Jun 22, 2022
ce6189b
Restyled by clang-format
restyled-commits Jun 22, 2022
169b7e4
Restyled by gn
restyled-commits Jun 22, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 0 additions & 3 deletions .github/.wordlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,6 @@ FW
gbl
gcloud
GDB
gdbserver
GeneralCommissioning
GeneralDiagnostics
GenericConfigurationManagerImpl
Expand Down Expand Up @@ -740,7 +739,6 @@ libwebkitgtk
lifecycle
lightbulb
lightin
LightingApp
LightingColor
LightingState
LinkSoftwareAndDocumentationPack
Expand Down Expand Up @@ -1127,7 +1125,6 @@ scm
sco
scp
ScriptBinding
SDB
SDC
SDHC
SDK
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cirque.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jobs:
${{ runner.os }}-cirque-

- name: Bootstrap
timeout-minutes: 15
timeout-minutes: 10
run: |
integrations/docker/images/chip-build-cirque/run.sh \
--env GITHUB_ACTION_RUN=1 \
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/darwin-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ concurrency:
jobs:
test_suites_chip_tool_darwin:
name: Test Suites - Darwin
timeout-minutes: 150
timeout-minutes: 135

strategy:
matrix:
Expand Down Expand Up @@ -82,7 +82,7 @@ jobs:
.environment/gn_out/.ninja_log
.environment/pigweed-venv/*.log
- name: Build Apps
timeout-minutes: 60
timeout-minutes: 45
run: |
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py \
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ concurrency:
jobs:
test_suites_linux:
name: Test Suites - Linux
timeout-minutes: 145
timeout-minutes: 140

strategy:
matrix:
build_variant: [no-ble-tsan-clang]
chip_tool: [""]
chip_tool: ["", -same-event-loop]
env:
BUILD_VARIANT: ${{matrix.build_variant}}
CHIP_TOOL_VARIANT: ${{matrix.chip_tool}}
Expand Down Expand Up @@ -90,7 +90,7 @@ jobs:
--copy-artifacts-to objdir-clone \
"
- name: Run Tests
timeout-minutes: 65
timeout-minutes: 60
run: |
./scripts/run_in_build_env.sh \
"./scripts/tests/run_test_suite.py \
Expand Down Expand Up @@ -121,12 +121,12 @@ jobs:
retention-days: 5
test_suites_darwin:
name: Test Suites - Darwin
timeout-minutes: 150
timeout-minutes: 140

strategy:
matrix:
build_variant: [no-ble-tsan-clang, no-ble-asan-clang]
chip_tool: [""]
chip_tool: ["", -same-event-loop]
env:
BUILD_VARIANT: ${{matrix.build_variant}}
CHIP_TOOL_VARIANT: ${{matrix.chip_tool}}
Expand Down Expand Up @@ -176,7 +176,7 @@ jobs:
.environment/gn_out/.ninja_log
.environment/pigweed-venv/*.log
- name: Build Apps
timeout-minutes: 40
timeout-minutes: 30
run: |
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py \
Expand All @@ -190,7 +190,7 @@ jobs:
--copy-artifacts-to objdir-clone \
"
- name: Run Tests
timeout-minutes: 80
timeout-minutes: 70
run: |
./scripts/run_in_build_env.sh \
"./scripts/tests/run_test_suite.py \
Expand Down Expand Up @@ -228,7 +228,7 @@ jobs:
retention-days: 5
repl_tests_linux:
name: REPL Tests - Linux
timeout-minutes: 130
timeout-minutes: 120

env:
TSAN_OPTIONS: "halt_on_error=1 suppressions=scripts/tests/chiptest/tsan-linux-suppressions.txt"
Expand Down Expand Up @@ -278,7 +278,7 @@ jobs:
--copy-artifacts-to objdir-clone \
"
- name: Run Tests
timeout-minutes: 40
timeout-minutes: 30
run: |
scripts/run_in_build_env.sh './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app --factoryreset --script-args "--log-level INFO -t 3600 --disable-test ClusterObjectTests.TestTimedRequestTimeout"'
- name: Uploading core files
Expand Down
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,3 @@ compile_commands.json

# backup files, usually created by the ZAP tool
*~

# log files
*.log
13 changes: 13 additions & 0 deletions build_overrides/pigweed_environment.gni
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Copyright (c) 2022 Project CHIP Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
3 changes: 1 addition & 2 deletions config/standalone/CHIPProjectConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@
//
#define CHIP_CONFIG_MAX_EXCHANGE_CONTEXTS 150

// Safe to enable this flag since standalone is associated with host and not a device.
#define CONFIG_BUILD_FOR_HOST_UNIT_TEST 1
#define CONFIG_IM_BUILD_FOR_UNIT_TEST 1

#endif /* CHIPPROJECTCONFIG_H */
Loading