Merge branch 'time-filter-posix-tz' into time-filter-posix-tz-cpptest

[time] Use add_define in the benchmark override too
[time] Touch posix_tz test to run the C++ unit tests in CI
2026-09-04 20:16:01 +00:00 · 2026-08-23 21:56:54 -05:00 · 2026-08-23 21:56:10 -05:00 · 2026-08-23 21:48:09 -05:00 · 2026-08-23 21:42:18 -05:00 · 2026-08-23 21:00:37 -05:00
4 changed files with 11 additions and 3 deletions
@@ -9,6 +9,7 @@ from esphome import automation
 from esphome.automation import Condition
 import esphome.codegen as cg
 from esphome.components.zephyr import zephyr_add_prj_conf
+from esphome.config_helpers import filter_source_files_from_defines
 import esphome.config_validation as cv
 from esphome.const import (
    CONF_AT,
@@ -475,3 +476,10 @@ async def to_code(config):
 async def time_has_time_to_code(config, condition_id, template_arg, args):
    paren = await cg.get_variable(config[CONF_ID])
    return cg.new_Pvariable(condition_id, template_arg, paren)
+
+
+# posix_tz.cpp is fully #ifdef'd on USE_TIME_TIMEZONE, set only when a
+# timezone is configured or detected.
+FILTER_SOURCE_FILES = filter_source_files_from_defines(
+    {"posix_tz.cpp": "USE_TIME_TIMEZONE"}
+)
@@ -4,6 +4,6 @@ from tests.testing_helpers import ComponentManifestOverride

 def override_manifest(manifest: ComponentManifestOverride) -> None:
    async def to_code(config):
-        cg.add_build_flag("-DUSE_TIME_TIMEZONE")
+        cg.add_define("USE_TIME_TIMEZONE")

    manifest.to_code = to_code
@@ -4,6 +4,6 @@ from tests.testing_helpers import ComponentManifestOverride

 def override_manifest(manifest: ComponentManifestOverride) -> None:
    async def to_code(config):
-        cg.add_build_flag("-DUSE_TIME_TIMEZONE")
+        cg.add_define("USE_TIME_TIMEZONE")

    manifest.to_code = to_code
@@ -1,7 +1,7 @@
 // Tests for time conversion functions, DST detection, and ESPTime::strptime.
 //
 // These tests cover the permanent timezone functions: epoch_to_local_tm, is_in_dst,
-// calculate_dst_transition, and the internal helper functions they depend on.
+// calculate_dst_transition, and the internal helpers they depend on.

 // Enable USE_TIME_TIMEZONE for tests
 #define USE_TIME_TIMEZONE
Author	SHA1	Message	Date
J. Nick Koston	48605d24ef	Merge branch 'time-filter-posix-tz' into time-filter-posix-tz-cpptest	2026-08-23 21:56:54 -05:00
J. Nick Koston	b186b6d6bb	[time] Use add_define in the benchmark override too	2026-08-23 21:56:10 -05:00
J. Nick Koston	e4a61c240d	[time] Touch posix_tz test to run the C++ unit tests in CI	2026-08-23 21:48:09 -05:00
J. Nick Koston	6573b57125	[time] Use add_define in the cpptests override so posix_tz.cpp survives the source filter	2026-08-23 21:42:18 -05:00
J. Nick Koston	2ab3d39522	Merge branch 'dev' into time-filter-posix-tz	2026-08-23 21:00:37 -05:00
J. Nick Koston	37180f748d	[time] Skip posix_tz.cpp when no timezone is configured	2026-08-23 10:12:17 -05:00