Skip to content

Commit

Permalink
Merge pull request #6 from project-chip/master
Browse files Browse the repository at this point in the history
update rotating-id-test-backup from remote master
  • Loading branch information
hnnajh committed Dec 10, 2020
2 parents 89a01bc + ccbffc1 commit 2e9b0c0
Show file tree
Hide file tree
Showing 319 changed files with 45,739 additions and 38,102 deletions.
4 changes: 4 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -232,5 +232,9 @@ TabWidth: 8
UseTab: Never
---
Language: JavaScript
BasedOnStyle: WebKit
AlignConsecutiveAssignments: true
AllowShortFunctionsOnASingleLine: None
IndentWidth: 2
ColumnLimit: 132
...
2 changes: 0 additions & 2 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,6 @@ jobs:
# - name: Upload Code Coverage
# if: ${{ contains('main', env.BUILD_TYPE) }}
# run: bash <(curl -s https://codecov.io/bash)
- name: Show tree
run: find .
- name: Remove third_party binaries for CodeQL Analysis
run: find out -type d -name "third_party" -exec rm -rf {} +
- name: Remove dbus binaries for CodeQL Analysis
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/examples-efr32.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,6 @@ jobs:
path: |
out/lock_app_debug/BRD4161A/chip-efr32-lock-example.out
out/lighting_app_debug/BRD4161A/chip-efr32-lighting-example.out
- name: Show tree
run: find .
- name: Remove third_party binaries for CodeQL Analysis
run: find out -type d -name "third_party" -exec rm -rf {} +
- name: Remove SiliconLabs binaries for CodeQL Analysis
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/examples-esp32.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,6 @@ jobs:
${{ env.BUILD_TYPE }}-example-build-${{
steps.outsuffix.outputs.value }}
path: /tmp/output_binaries/${{ env.BUILD_TYPE }}-build
- name: Show tree
run: find .
# - name: Remove third_party binaries for CodeQL Analysis
# run: find . -type d -name "third_party" -exec rm -rf {} +
# - name: Remove m5stack-tft binaries for CodeQL Analysis
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/examples-linux-standalone.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,6 @@ jobs:
path: |
out/chip_tool_debug/chip-tool
out/shell_debug/chip-shell
- name: Show tree
run: find .
- name: Remove third_party binaries for CodeQL Analysis
run: find out -type d -name "third_party" -exec rm -rf {} +
- name: Remove dbus binaries for CodeQL Analysis
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/examples-nrfconnect.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,6 @@ jobs:
steps.outsuffix.outputs.value }}
path: /tmp/output_binaries/${{ env.BUILD_TYPE }}-build
# https://github.com/project-chip/connectedhomeip/issues/3100
# - name: Show tree
# run: find .
# - name: Remove third_party binaries for CodeQL Analysis
# run: find examples -type d -name "third_party" -exec rm -rf {} +
# - name: Remove nrfxlib binaries for CodeQL Analysis
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/examples-qpg6100.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,6 @@ jobs:
path: |
out/lock_app_debug/chip-qpg6100-lock-example.out
out/shell_app/shell-qpg6100.out
- name: Show tree
run: find .
- name: Remove third_party binaries for CodeQL Analysis
run: find out -type d -name "third_party" -exec rm -rf {} +
- name: Perform CodeQL Analysis
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
out/
/src/test_driver/nrfconnect/build/

# Environment directory
.environment/

# Temporary Directories
.tmp/

Expand Down
15 changes: 13 additions & 2 deletions BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import("//build_overrides/nlassert.gni")
import("//build_overrides/nlio.gni")
import("//build_overrides/nlunit_test.gni")
import("//build_overrides/pigweed.gni")
import("$dir_pw_build/python.gni")

# This build file should not be used in superproject builds.
assert(chip_root == "//")
Expand All @@ -32,6 +33,14 @@ if (current_toolchain != "${dir_pw_toolchain}/dummy:dummy") {
(host_cpu == "x64" || host_cpu == "arm64")
}

# Python packages for supporting specific targets.
pw_python_group("python_packages") {
python_deps = [
"integrations/mobly:chip_mobly",
"third_party/happy",
]
}

# This is a real toolchain. Build CHIP.
group("default") {
deps = [
Expand Down Expand Up @@ -64,6 +73,8 @@ if (current_toolchain != "${dir_pw_toolchain}/dummy:dummy") {
if (chip_build_tools) {
deps += [
"${chip_root}/examples/shell/standalone:chip-shell",
"${chip_root}/src/messaging/tests/echo:chip-echo-requester",
"${chip_root}/src/messaging/tests/echo:chip-echo-responder",
"${chip_root}/src/qrcodetool",
"${chip_root}/src/setup_payload",
]
Expand Down Expand Up @@ -132,11 +143,11 @@ if (current_toolchain != "${dir_pw_toolchain}/dummy:dummy") {

# Build the Linux all clusters app example.
enable_linux_all_clusters_app_build =
enable_default_builds && host_os == "linux"
enable_default_builds && (host_os == "linux" || host_os == "mac")

# Build the Linux lighting app example.
enable_linux_lighting_app_build =
enable_default_builds && host_os == "linux"
enable_default_builds && (host_os == "linux" || host_os == "mac")

# Build the efr32 lock app example.
enable_efr32_lock_app_build = enable_efr32_builds
Expand Down
3 changes: 2 additions & 1 deletion build/chip/chip_test.gni
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

import("//build_overrides/chip.gni")
import("//build_overrides/pigweed.gni")
import("$dir_pw_build/python_action.gni")

import("${chip_root}/build/chip/tests.gni")
import("${chip_root}/src/platform/device.gni")
Expand All @@ -35,7 +36,7 @@ if (chip_link_tests) {
output_dir = _test_output_dir
}

pw_python_script(_test_name + "_run") {
pw_python_action(_test_name + "_run") {
deps = [ ":${_test_name}" ]
inputs = [ pw_unit_test_AUTOMATIC_RUNNER ]
script = "$dir_pw_unit_test/py/pw_unit_test/test_runner.py"
Expand Down
Loading

0 comments on commit 2e9b0c0

Please sign in to comment.