From 324d0624f3cc42c616f58567157e88bf4b4c96ac Mon Sep 17 00:00:00 2001 From: Mark VanderVoord Date: Tue, 26 May 2026 17:13:03 -0400 Subject: [PATCH] Pull paths from reusable target information. --- test/rakefile_helper.rb | 2 ++ test/targets/clang_file.yml | 6 ------ test/targets/clang_strict.yml | 6 ------ test/targets/gcc_32.yml | 6 ------ test/targets/gcc_64.yml | 6 ------ test/targets/gcc_64_ansi.yml | 6 ------ test/targets/gcc_64_auto_limits.yml | 6 ------ test/targets/gcc_64_auto_stdint.yml | 6 ------ test/targets/gcc_64_manual_math.yml | 6 ------ 9 files changed, 2 insertions(+), 48 deletions(-) diff --git a/test/rakefile_helper.rb b/test/rakefile_helper.rb index 241a507..439e593 100644 --- a/test/rakefile_helper.rb +++ b/test/rakefile_helper.rb @@ -21,6 +21,8 @@ module RakefileHelpers $cfg_file = "targets/#{config_file}" end $cfg = YamlHelper.load_file($cfg_file) + $cfg[:paths] ||= {} + $cfg[:paths][:test] ||= ['src/', '../src/', 'testdata/', 'tests/'] $colour_output = false unless $cfg['colour'] $configured = true if config_file != DEFAULT_CONFIG_FILE end diff --git a/test/targets/clang_file.yml b/test/targets/clang_file.yml index ab9f3d6..d4c5943 100644 --- a/test/targets/clang_file.yml +++ b/test/targets/clang_file.yml @@ -63,12 +63,6 @@ :extension: :object: ".o" :executable: ".exe" -:paths: - :test: - - src/ - - "../src/" - - testdata/ - - tests/ :defines: :test: - UNITY_INCLUDE_DOUBLE diff --git a/test/targets/clang_strict.yml b/test/targets/clang_strict.yml index 75b3eee..bfff265 100644 --- a/test/targets/clang_strict.yml +++ b/test/targets/clang_strict.yml @@ -62,12 +62,6 @@ :extension: :object: ".o" :executable: ".exe" -:paths: - :test: - - src/ - - "../src/" - - testdata/ - - tests/ :defines: :test: - UNITY_INCLUDE_DOUBLE diff --git a/test/targets/gcc_32.yml b/test/targets/gcc_32.yml index f09e00b..679499d 100644 --- a/test/targets/gcc_32.yml +++ b/test/targets/gcc_32.yml @@ -33,12 +33,6 @@ :extension: :object: ".o" :executable: ".exe" -:paths: - :test: - - src/ - - "../src/" - - testdata/ - - tests/ :defines: :test: - UNITY_EXCLUDE_STDINT_H diff --git a/test/targets/gcc_64.yml b/test/targets/gcc_64.yml index 85d0c74..1c3f42b 100644 --- a/test/targets/gcc_64.yml +++ b/test/targets/gcc_64.yml @@ -33,12 +33,6 @@ :extension: :object: ".o" :executable: ".exe" -:paths: - :test: - - src/ - - "../src/" - - testdata/ - - tests/ :defines: :test: - UNITY_EXCLUDE_STDINT_H diff --git a/test/targets/gcc_64_ansi.yml b/test/targets/gcc_64_ansi.yml index 18f4be5..b5decea 100644 --- a/test/targets/gcc_64_ansi.yml +++ b/test/targets/gcc_64_ansi.yml @@ -34,12 +34,6 @@ :extension: :object: ".o" :executable: ".exe" -:paths: - :test: - - src/ - - "../src/" - - testdata/ - - tests/ :defines: :test: - UNITY_INCLUDE_DOUBLE diff --git a/test/targets/gcc_64_auto_limits.yml b/test/targets/gcc_64_auto_limits.yml index 009c97a..bbd6a86 100644 --- a/test/targets/gcc_64_auto_limits.yml +++ b/test/targets/gcc_64_auto_limits.yml @@ -33,12 +33,6 @@ :extension: :object: ".o" :executable: ".exe" -:paths: - :test: - - src/ - - "../src/" - - testdata/ - - tests/ :defines: :test: - UNITY_EXCLUDE_STDINT_H diff --git a/test/targets/gcc_64_auto_stdint.yml b/test/targets/gcc_64_auto_stdint.yml index 5294f3f..9193de7 100644 --- a/test/targets/gcc_64_auto_stdint.yml +++ b/test/targets/gcc_64_auto_stdint.yml @@ -46,12 +46,6 @@ :extension: :object: ".o" :executable: ".exe" -:paths: - :test: - - src/ - - "../src/" - - testdata/ - - tests/ :defines: :test: - UNITY_INCLUDE_DOUBLE diff --git a/test/targets/gcc_64_manual_math.yml b/test/targets/gcc_64_manual_math.yml index 40374b4..4524f9b 100644 --- a/test/targets/gcc_64_manual_math.yml +++ b/test/targets/gcc_64_manual_math.yml @@ -33,12 +33,6 @@ :extension: :object: ".o" :executable: ".exe" -:paths: - :test: - - src/ - - "../src/" - - testdata/ - - tests/ :defines: :test: - UNITY_EXCLUDE_MATH_H