Skip to content

Commit 324d062

Browse files
committed
Pull paths from reusable target information.
1 parent 4fe7d60 commit 324d062

9 files changed

Lines changed: 2 additions & 48 deletions

test/rakefile_helper.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ def load_configuration(config_file)
2121
$cfg_file = "targets/#{config_file}"
2222
end
2323
$cfg = YamlHelper.load_file($cfg_file)
24+
$cfg[:paths] ||= {}
25+
$cfg[:paths][:test] ||= ['src/', '../src/', 'testdata/', 'tests/']
2426
$colour_output = false unless $cfg['colour']
2527
$configured = true if config_file != DEFAULT_CONFIG_FILE
2628
end

test/targets/clang_file.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,6 @@
6363
:extension:
6464
:object: ".o"
6565
:executable: ".exe"
66-
:paths:
67-
:test:
68-
- src/
69-
- "../src/"
70-
- testdata/
71-
- tests/
7266
:defines:
7367
:test:
7468
- UNITY_INCLUDE_DOUBLE

test/targets/clang_strict.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,6 @@
6262
:extension:
6363
:object: ".o"
6464
:executable: ".exe"
65-
:paths:
66-
:test:
67-
- src/
68-
- "../src/"
69-
- testdata/
70-
- tests/
7165
:defines:
7266
:test:
7367
- UNITY_INCLUDE_DOUBLE

test/targets/gcc_32.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,6 @@
3333
:extension:
3434
:object: ".o"
3535
:executable: ".exe"
36-
:paths:
37-
:test:
38-
- src/
39-
- "../src/"
40-
- testdata/
41-
- tests/
4236
:defines:
4337
:test:
4438
- UNITY_EXCLUDE_STDINT_H

test/targets/gcc_64.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,6 @@
3333
:extension:
3434
:object: ".o"
3535
:executable: ".exe"
36-
:paths:
37-
:test:
38-
- src/
39-
- "../src/"
40-
- testdata/
41-
- tests/
4236
:defines:
4337
:test:
4438
- UNITY_EXCLUDE_STDINT_H

test/targets/gcc_64_ansi.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,6 @@
3434
:extension:
3535
:object: ".o"
3636
:executable: ".exe"
37-
:paths:
38-
:test:
39-
- src/
40-
- "../src/"
41-
- testdata/
42-
- tests/
4337
:defines:
4438
:test:
4539
- UNITY_INCLUDE_DOUBLE

test/targets/gcc_64_auto_limits.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,6 @@
3333
:extension:
3434
:object: ".o"
3535
:executable: ".exe"
36-
:paths:
37-
:test:
38-
- src/
39-
- "../src/"
40-
- testdata/
41-
- tests/
4236
:defines:
4337
:test:
4438
- UNITY_EXCLUDE_STDINT_H

test/targets/gcc_64_auto_stdint.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,6 @@
4646
:extension:
4747
:object: ".o"
4848
:executable: ".exe"
49-
:paths:
50-
:test:
51-
- src/
52-
- "../src/"
53-
- testdata/
54-
- tests/
5549
:defines:
5650
:test:
5751
- UNITY_INCLUDE_DOUBLE

test/targets/gcc_64_manual_math.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,6 @@
3333
:extension:
3434
:object: ".o"
3535
:executable: ".exe"
36-
:paths:
37-
:test:
38-
- src/
39-
- "../src/"
40-
- testdata/
41-
- tests/
4236
:defines:
4337
:test:
4438
- UNITY_EXCLUDE_MATH_H

0 commit comments

Comments
 (0)