From da986d7fc6aca1e163237893ee842d0290855270 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@home-assistant.io>
Date: Wed, 8 Oct 2025 13:05:13 -1000
Subject: [PATCH] fix

---
 script/test_build_components                           | 6 +++++-
 tests/components/inkplate/test.esp32-ard.yaml          | 3 +++
 tests/components/inkplate/test.esp32-idf.yaml          | 3 +++
 tests/components/lps22/test.esp32-ard.yaml             | 5 -----
 tests/components/lps22/test.esp32-c3-ard.yaml          | 5 -----
 tests/components/lps22/test.esp32-c3-idf.yaml          | 5 -----
 tests/components/lps22/test.esp32-idf.yaml             | 5 -----
 tests/components/lps22/test.esp8266-ard.yaml           | 5 -----
 tests/components/lps22/test.rp2040-ard.yaml            | 5 -----
 tests/components/m5stack_8angle/test.esp32-ard.yaml    | 3 +++
 tests/components/m5stack_8angle/test.esp32-c3-ard.yaml | 3 +++
 tests/components/m5stack_8angle/test.esp32-c3-idf.yaml | 3 +++
 tests/components/m5stack_8angle/test.esp32-idf.yaml    | 3 +++
 tests/components/m5stack_8angle/test.esp8266-ard.yaml  | 3 +++
 tests/components/m5stack_8angle/test.rp2040-ard.yaml   | 3 +++
 tests/components/mcp23s08/test.esp32-ard.yaml          | 2 +-
 16 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/script/test_build_components b/script/test_build_components
index fd7388a2b1..64846f2bb4 100755
--- a/script/test_build_components
+++ b/script/test_build_components
@@ -57,7 +57,11 @@ start_esphome() {
   echo "> [$target_component] [$test_name] [$target_platform_with_version]"
   set -x
   # TODO: Validate escape of Command line substitution value
-  python3 -m esphome -s component_name $target_component -s component_dir ../../components/$target_component -s test_name $test_name -s target_platform $target_platform $esphome_command $component_test_file
+  if [ "$continue_on_fail" = true ]; then
+    python3 -m esphome -s component_name $target_component -s component_dir ../../components/$target_component -s test_name $test_name -s target_platform $target_platform $esphome_command $component_test_file || true
+  else
+    python3 -m esphome -s component_name $target_component -s component_dir ../../components/$target_component -s test_name $test_name -s target_platform $target_platform $esphome_command $component_test_file
+  fi
   { set +x; } 2>/dev/null
 }
 
diff --git a/tests/components/inkplate/test.esp32-ard.yaml b/tests/components/inkplate/test.esp32-ard.yaml
index dade44d145..7c503b0ccb 100644
--- a/tests/components/inkplate/test.esp32-ard.yaml
+++ b/tests/components/inkplate/test.esp32-ard.yaml
@@ -1 +1,4 @@
+packages:
+  i2c: !include ../../test_build_components/common/i2c/esp32-ard.yaml
+
 <<: !include common.yaml
diff --git a/tests/components/inkplate/test.esp32-idf.yaml b/tests/components/inkplate/test.esp32-idf.yaml
index dade44d145..b47e39c389 100644
--- a/tests/components/inkplate/test.esp32-idf.yaml
+++ b/tests/components/inkplate/test.esp32-idf.yaml
@@ -1 +1,4 @@
+packages:
+  i2c: !include ../../test_build_components/common/i2c/esp32-idf.yaml
+
 <<: !include common.yaml
diff --git a/tests/components/lps22/test.esp32-ard.yaml b/tests/components/lps22/test.esp32-ard.yaml
index 79e47c414b..7c503b0ccb 100644
--- a/tests/components/lps22/test.esp32-ard.yaml
+++ b/tests/components/lps22/test.esp32-ard.yaml
@@ -1,8 +1,3 @@
-i2c:
-  - id: i2c_lps22
-    scl: 16
-    sda: 17
-
 packages:
   i2c: !include ../../test_build_components/common/i2c/esp32-ard.yaml
 
diff --git a/tests/components/lps22/test.esp32-c3-ard.yaml b/tests/components/lps22/test.esp32-c3-ard.yaml
index e4327362e7..02a6d29e57 100644
--- a/tests/components/lps22/test.esp32-c3-ard.yaml
+++ b/tests/components/lps22/test.esp32-c3-ard.yaml
@@ -1,8 +1,3 @@
-i2c:
-  - id: i2c_lps22
-    scl: 5
-    sda: 4
-
 packages:
   i2c: !include ../../test_build_components/common/i2c/esp32-c3-ard.yaml
 
diff --git a/tests/components/lps22/test.esp32-c3-idf.yaml b/tests/components/lps22/test.esp32-c3-idf.yaml
index 2df96a4f72..9990d96d29 100644
--- a/tests/components/lps22/test.esp32-c3-idf.yaml
+++ b/tests/components/lps22/test.esp32-c3-idf.yaml
@@ -1,8 +1,3 @@
-i2c:
-  - id: i2c_lps22
-    scl: 5
-    sda: 4
-
 packages:
   i2c: !include ../../test_build_components/common/i2c/esp32-c3-idf.yaml
 
diff --git a/tests/components/lps22/test.esp32-idf.yaml b/tests/components/lps22/test.esp32-idf.yaml
index 11a410f2c9..b47e39c389 100644
--- a/tests/components/lps22/test.esp32-idf.yaml
+++ b/tests/components/lps22/test.esp32-idf.yaml
@@ -1,8 +1,3 @@
-i2c:
-  - id: i2c_lps22
-    scl: 16
-    sda: 17
-
 packages:
   i2c: !include ../../test_build_components/common/i2c/esp32-idf.yaml
 
diff --git a/tests/components/lps22/test.esp8266-ard.yaml b/tests/components/lps22/test.esp8266-ard.yaml
index f0c83d2cc9..4a98b9388a 100644
--- a/tests/components/lps22/test.esp8266-ard.yaml
+++ b/tests/components/lps22/test.esp8266-ard.yaml
@@ -1,8 +1,3 @@
-i2c:
-  - id: i2c_lps22
-    scl: 5
-    sda: 4
-
 packages:
   i2c: !include ../../test_build_components/common/i2c/esp8266-ard.yaml
 
diff --git a/tests/components/lps22/test.rp2040-ard.yaml b/tests/components/lps22/test.rp2040-ard.yaml
index 3f174b0b34..319a7c71a6 100644
--- a/tests/components/lps22/test.rp2040-ard.yaml
+++ b/tests/components/lps22/test.rp2040-ard.yaml
@@ -1,8 +1,3 @@
-i2c:
-  - id: i2c_lps22
-    scl: 5
-    sda: 4
-
 packages:
   i2c: !include ../../test_build_components/common/i2c/rp2040-ard.yaml
 
diff --git a/tests/components/m5stack_8angle/test.esp32-ard.yaml b/tests/components/m5stack_8angle/test.esp32-ard.yaml
index dade44d145..7c503b0ccb 100644
--- a/tests/components/m5stack_8angle/test.esp32-ard.yaml
+++ b/tests/components/m5stack_8angle/test.esp32-ard.yaml
@@ -1 +1,4 @@
+packages:
+  i2c: !include ../../test_build_components/common/i2c/esp32-ard.yaml
+
 <<: !include common.yaml
diff --git a/tests/components/m5stack_8angle/test.esp32-c3-ard.yaml b/tests/components/m5stack_8angle/test.esp32-c3-ard.yaml
index dade44d145..02a6d29e57 100644
--- a/tests/components/m5stack_8angle/test.esp32-c3-ard.yaml
+++ b/tests/components/m5stack_8angle/test.esp32-c3-ard.yaml
@@ -1 +1,4 @@
+packages:
+  i2c: !include ../../test_build_components/common/i2c/esp32-c3-ard.yaml
+
 <<: !include common.yaml
diff --git a/tests/components/m5stack_8angle/test.esp32-c3-idf.yaml b/tests/components/m5stack_8angle/test.esp32-c3-idf.yaml
index dade44d145..9990d96d29 100644
--- a/tests/components/m5stack_8angle/test.esp32-c3-idf.yaml
+++ b/tests/components/m5stack_8angle/test.esp32-c3-idf.yaml
@@ -1 +1,4 @@
+packages:
+  i2c: !include ../../test_build_components/common/i2c/esp32-c3-idf.yaml
+
 <<: !include common.yaml
diff --git a/tests/components/m5stack_8angle/test.esp32-idf.yaml b/tests/components/m5stack_8angle/test.esp32-idf.yaml
index dade44d145..b47e39c389 100644
--- a/tests/components/m5stack_8angle/test.esp32-idf.yaml
+++ b/tests/components/m5stack_8angle/test.esp32-idf.yaml
@@ -1 +1,4 @@
+packages:
+  i2c: !include ../../test_build_components/common/i2c/esp32-idf.yaml
+
 <<: !include common.yaml
diff --git a/tests/components/m5stack_8angle/test.esp8266-ard.yaml b/tests/components/m5stack_8angle/test.esp8266-ard.yaml
index dade44d145..4a98b9388a 100644
--- a/tests/components/m5stack_8angle/test.esp8266-ard.yaml
+++ b/tests/components/m5stack_8angle/test.esp8266-ard.yaml
@@ -1 +1,4 @@
+packages:
+  i2c: !include ../../test_build_components/common/i2c/esp8266-ard.yaml
+
 <<: !include common.yaml
diff --git a/tests/components/m5stack_8angle/test.rp2040-ard.yaml b/tests/components/m5stack_8angle/test.rp2040-ard.yaml
index dade44d145..319a7c71a6 100644
--- a/tests/components/m5stack_8angle/test.rp2040-ard.yaml
+++ b/tests/components/m5stack_8angle/test.rp2040-ard.yaml
@@ -1 +1,4 @@
+packages:
+  i2c: !include ../../test_build_components/common/i2c/rp2040-ard.yaml
+
 <<: !include common.yaml
diff --git a/tests/components/mcp23s08/test.esp32-ard.yaml b/tests/components/mcp23s08/test.esp32-ard.yaml
index 690ff5c060..5a48fca9e2 100644
--- a/tests/components/mcp23s08/test.esp32-ard.yaml
+++ b/tests/components/mcp23s08/test.esp32-ard.yaml
@@ -2,6 +2,6 @@ substitutions:
   cs_pin: GPIO5
 
 packages:
-  i2c: !include ../../test_build_components/common/i2c/esp32-ard.yaml
+  spi: !include ../../test_build_components/common/spi/esp32-ard.yaml
 
 <<: !include common.yaml