Skip to content

Commit 44c90b0

Browse files
Revert redundant changes to configurator_builder.rb
1 parent 30f13f4 commit 44c90b0

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

lib/ceedling/configurator_builder.rb

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -236,22 +236,22 @@ def set_test_preprocessor_accessors(in_hash)
236236
accessors = {
237237
:project_use_test_preprocessor_tests => false,
238238
:project_use_test_preprocessor_mocks => false
239-
}
239+
}
240240
when :all
241241
accessors = {
242242
:project_use_test_preprocessor_tests => true,
243243
:project_use_test_preprocessor_mocks => true
244-
}
244+
}
245245
when :tests
246246
accessors = {
247247
:project_use_test_preprocessor_tests => true,
248248
:project_use_test_preprocessor_mocks => false
249-
}
249+
}
250250
when :mocks
251251
accessors = {
252252
:project_use_test_preprocessor_tests => false,
253253
:project_use_test_preprocessor_mocks => true
254-
}
254+
}
255255
end
256256

257257
return accessors
@@ -375,13 +375,9 @@ def collect_source(in_hash)
375375
# Force Rake::FileList to expand patterns to ensure it happens (FileList is a bit unreliable)
376376
all_source.resolve()
377377

378-
# Force Rake::FileList to expand patterns to ensure it happens (FileList is a bit unreliable)
379-
revised_source = @file_path_collection_utils.revise_filelist( all_source, in_hash[:files_source] )
380-
revised_source.resolve()
381-
382378
return {
383379
# Add / subtract files via :files ↳ :source
384-
:collection_all_source => revised_source
380+
:collection_all_source => @file_path_collection_utils.revise_filelist( all_source, in_hash[:files_source] )
385381
}
386382
end
387383

@@ -514,7 +510,7 @@ def collect_test_fixture_extra_link_objects(in_hash)
514510
# No build paths here so plugins can remap if necessary (i.e. path mapping happens at runtime)
515511
objects.map! { |object| object.ext(in_hash[:extension_object]) }
516512

517-
return {
513+
return {
518514
:collection_all_support => sources,
519515
:collection_test_fixture_extra_link_objects => objects
520516
}

0 commit comments

Comments
 (0)