ceedling 1.2.1 → 1.2.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/GIT_COMMIT_SHA +1 -1
- data/README.md +11 -9
- data/Rakefile +2 -1
- data/assets/features/ceedling +1 -1
- data/assets/fixtures/test_source_file_duplicate_basenames/test_calc_typo.c +14 -0
- data/assets/fixtures/tests_with_duplicate_test_names/test_foo.c +21 -0
- data/assets/fixtures/tests_with_partials_coverage/src/private_macro.c +7 -0
- data/assets/fixtures/tests_with_partials_coverage/src/private_macro.h +5 -0
- data/assets/fixtures/tests_with_partials_coverage/src/tally.c +13 -0
- data/assets/fixtures/tests_with_partials_coverage/src/tally.h +4 -0
- data/assets/fixtures/tests_with_partials_coverage/test/test_private_macro.c +10 -0
- data/assets/fixtures/tests_with_partials_coverage/test/test_tally.c +9 -0
- data/bin/actionator.rb +6 -12
- data/bin/app_cfg.rb +14 -1
- data/bin/ceedling +13 -3
- data/bin/cli.rb +25 -6
- data/bin/cli_handler.rb +113 -73
- data/bin/cli_helper.rb +51 -78
- data/bin/installation_selector.rb +81 -0
- data/bin/launchinator.rb +69 -0
- data/bin/mixin_resolvinator.rb +26 -36
- data/bin/objects.yml +13 -0
- data/bin/path_validator.rb +25 -29
- data/bin/versionator.rb +47 -48
- data/ceedling.gemspec +19 -15
- data/docs/BreakingChanges.md +86 -1
- data/docs/Changelog.md +145 -3
- data/docs/KnownIssues.md +179 -6
- data/docs/ReleaseNotes.md +13 -0
- data/examples/wondrous_forest/README.md +29 -1
- data/examples/wondrous_forest/src/ForestUnits.h +23 -0
- data/examples/wondrous_forest/src/RainGauge.c +59 -0
- data/examples/wondrous_forest/src/RainGauge.h +39 -0
- data/examples/wondrous_forest/src/RainTipIsr.c +17 -0
- data/examples/wondrous_forest/src/RainTipIsr.h +14 -0
- data/examples/wondrous_forest/test/TestRainGauge.c +126 -0
- data/lib/ceedling/build_log_writer.rb +33 -0
- data/lib/ceedling/c_extractor/README.md +15 -7
- data/lib/ceedling/c_extractor/c_extractor.rb +25 -14
- data/lib/ceedling/c_extractor/c_extractor_code_text.rb +84 -54
- data/lib/ceedling/c_extractor/c_extractor_constants.rb +18 -7
- data/lib/ceedling/c_extractor/c_extractor_declarations.rb +319 -283
- data/lib/ceedling/c_extractor/c_extractor_declarator.rb +285 -0
- data/lib/ceedling/c_extractor/c_extractor_defined_type.rb +111 -0
- data/lib/ceedling/c_extractor/c_extractor_definitions.rb +174 -121
- data/lib/ceedling/c_extractor/c_extractor_functions.rb +191 -162
- data/lib/ceedling/c_extractor/c_extractor_preprocessing.rb +46 -55
- data/lib/ceedling/c_extractor/c_extractor_statement.rb +30 -0
- data/lib/ceedling/c_extractor/c_extractor_types.rb +63 -41
- data/lib/ceedling/c_extractor/c_module_edits.rb +48 -0
- data/lib/ceedling/c_identifier.rb +21 -0
- data/lib/ceedling/ceedling.h +8 -0
- data/lib/ceedling/config/build_root_policy.rb +70 -0
- data/lib/ceedling/config/configurator.rb +18 -19
- data/lib/ceedling/config/configurator_builder.rb +75 -28
- data/lib/ceedling/config/configurator_paths_validator.rb +179 -0
- data/lib/ceedling/config/configurator_plugins.rb +1 -1
- data/lib/ceedling/config/configurator_setup.rb +44 -33
- data/lib/ceedling/config/configurator_validator.rb +1 -110
- data/lib/ceedling/constants.rb +5 -1
- data/lib/ceedling/defaults.rb +35 -5
- data/lib/ceedling/dependencies/CACHE_SCHEMA.md +118 -0
- data/lib/ceedling/dependencies/README.md +18 -16
- data/lib/ceedling/dependencies/dependency_cache_store.rb +43 -21
- data/lib/ceedling/dependencies/dependency_hasher.rb +35 -1
- data/lib/ceedling/dependencies/dependency_tracker.rb +9 -3
- data/lib/ceedling/dependencies/dependinator.rb +13 -1
- data/lib/ceedling/diagnostics/DOCTOR.md +142 -0
- data/lib/ceedling/diagnostics/README.md +5 -0
- data/lib/ceedling/diagnostics/build_step_doctor.rb +110 -0
- data/lib/ceedling/diagnostics/duplicate_symbol_specialist.rb +108 -0
- data/lib/ceedling/diagnostics/guidance_phrases.rb +30 -0
- data/lib/ceedling/diagnostics/header_collision_guidance.rb +56 -0
- data/lib/ceedling/diagnostics/header_collision_specialist.rb +152 -0
- data/lib/ceedling/diagnostics/include_depth_specialist.rb +132 -0
- data/lib/ceedling/diagnostics/missing_symbol_specialist.rb +111 -0
- data/lib/ceedling/diagnostics/partial_name_specialist.rb +134 -0
- data/lib/ceedling/diagnostics/toolchain_output.rb +44 -0
- data/lib/ceedling/filename_extension.rb +7 -1
- data/lib/ceedling/filesystem/FILE_TREE.md +253 -0
- data/lib/ceedling/filesystem/PATH_HANDLING.md +360 -0
- data/lib/ceedling/filesystem/README.md +46 -0
- data/lib/ceedling/filesystem/build_roots.rb +105 -0
- data/lib/ceedling/filesystem/build_subpath.rb +187 -0
- data/lib/ceedling/filesystem/destination_collision.rb +25 -0
- data/lib/ceedling/{file_finder.rb → filesystem/file_finder.rb} +177 -156
- data/lib/ceedling/filesystem/file_finder_helper.rb +154 -0
- data/lib/ceedling/filesystem/file_path_collection_utils.rb +183 -0
- data/lib/ceedling/{file_path_utils.rb → filesystem/file_path_utils.rb} +200 -167
- data/lib/ceedling/{file_system_wrapper.rb → filesystem/file_system_wrapper.rb} +6 -5
- data/lib/ceedling/filesystem/file_tree.rb +241 -0
- data/lib/ceedling/{file_wrapper.rb → filesystem/file_wrapper.rb} +149 -65
- data/lib/ceedling/filesystem/path_exclusions.rb +30 -0
- data/lib/ceedling/{path_matcher.rb → filesystem/path_matcher.rb} +48 -23
- data/lib/ceedling/{path_mirror.rb → filesystem/path_mirror.rb} +19 -18
- data/lib/ceedling/filesystem/path_spellings.rb +55 -0
- data/lib/ceedling/filesystem/project_paths.rb +184 -0
- data/lib/ceedling/filesystem/test_build_layout.rb +114 -0
- data/lib/ceedling/filesystem/win_long_paths.rb +153 -0
- data/lib/ceedling/filesystem/win_path_limit.rb +83 -0
- data/lib/ceedling/filesystem/win_path_prober.rb +52 -0
- data/lib/ceedling/filesystem/working_dir.rb +40 -0
- data/lib/ceedling/generators/generator.rb +32 -70
- data/lib/ceedling/generators/generator_helper.rb +0 -44
- data/lib/ceedling/generators/generator_mocks.rb +5 -0
- data/lib/ceedling/generators/generator_partials.rb +306 -244
- data/lib/ceedling/generators/generator_test_results_backtrace.rb +7 -7
- data/lib/ceedling/generators/generator_test_runner.rb +5 -8
- data/lib/ceedling/generators/partial_header_writer.rb +95 -0
- data/lib/ceedling/generators/partial_source_writer.rb +137 -0
- data/lib/ceedling/handoff.rb +121 -0
- data/lib/ceedling/includes/header_search.rb +225 -0
- data/lib/ceedling/includes/include_factory.rb +9 -12
- data/lib/ceedling/includes/include_pathinator.rb +112 -33
- data/lib/ceedling/includes/includes.rb +150 -38
- data/lib/ceedling/installation.rb +92 -0
- data/lib/ceedling/library_resolver.rb +99 -0
- data/lib/ceedling/objects.yml +112 -6
- data/lib/ceedling/partials/README.md +110 -16
- data/lib/ceedling/partials/carry_plan.rb +71 -0
- data/lib/ceedling/partials/definition_head.rb +74 -0
- data/lib/ceedling/partials/include_groups.rb +37 -0
- data/lib/ceedling/partials/interface_extras.rb +25 -0
- data/lib/ceedling/partials/partializer.rb +603 -124
- data/lib/ceedling/partials/partializer_config.rb +8 -1
- data/lib/ceedling/partials/partializer_helper.rb +851 -145
- data/lib/ceedling/partials/partializer_reconciler.rb +174 -0
- data/lib/ceedling/partials/partializer_utils.rb +89 -109
- data/lib/ceedling/partials/partials.rb +153 -10
- data/lib/ceedling/partials/type_macros.rb +126 -0
- data/lib/ceedling/plugins/report_log_writer_plugin.rb +3 -5
- data/lib/ceedling/preprocess/README.md +43 -33
- data/lib/ceedling/preprocess/preprocessinator.rb +100 -186
- data/lib/ceedling/preprocess/preprocessinator_code_finder.rb +65 -72
- data/lib/ceedling/preprocess/preprocessinator_file_assembler.rb +32 -76
- data/lib/ceedling/preprocess/preprocessinator_includes_handler.rb +1 -1
- data/lib/ceedling/preprocess/preprocessinator_line_marker_includes_extractor.rb +1 -1
- data/lib/ceedling/preprocess/preprocessinator_reconstructor.rb +51 -14
- data/lib/ceedling/rake_app/rakefile_component_resolver.rb +10 -17
- data/lib/ceedling/rakefile.rb +15 -1
- data/lib/ceedling/rakefiles/base/tasks_base.rake +1 -1
- data/lib/ceedling/rakefiles/release/rules_release.rake +4 -7
- data/lib/ceedling/release_invoker/release_build_executor.rb +33 -44
- data/lib/ceedling/release_invoker/release_build_planner.rb +14 -6
- data/lib/ceedling/reportinator.rb +3 -4
- data/lib/ceedling/setupinator.rb +104 -87
- data/lib/ceedling/test_context_extractor.rb +5 -1
- data/lib/ceedling/test_invoker/HEADER_COLLISIONS.md +21 -7
- data/lib/ceedling/test_invoker/PIPELINE.md +62 -19
- data/lib/ceedling/test_invoker/README.md +1 -1
- data/lib/ceedling/test_invoker/derived_search_path_notices.rb +45 -0
- data/lib/ceedling/test_invoker/mock_locator.rb +175 -10
- data/lib/ceedling/test_invoker/partial_files_preprocessinator.rb +181 -0
- data/lib/ceedling/test_invoker/partials_manager.rb +271 -302
- data/lib/ceedling/test_invoker/standin_headerinator.rb +19 -17
- data/lib/ceedling/test_invoker/test_bare_includes_extractinator.rb +26 -3
- data/lib/ceedling/test_invoker/test_build_executor.rb +358 -234
- data/lib/ceedling/test_invoker/test_build_planner.rb +46 -33
- data/lib/ceedling/test_invoker/test_build_setup.rb +43 -18
- data/lib/ceedling/test_invoker/test_build_validations.rb +35 -47
- data/lib/ceedling/test_invoker/test_derived_search_paths.rb +189 -0
- data/lib/ceedling/test_invoker/test_file_preprocessinator.rb +2 -3
- data/lib/ceedling/test_invoker/test_includes_reconcilinator.rb +1 -1
- data/lib/ceedling/test_invoker/test_invoker.rb +6 -1
- data/lib/ceedling/test_invoker/test_invoker_types.rb +28 -20
- data/lib/ceedling/test_invoker/test_pipeline_helpers.rb +6 -4
- data/lib/ceedling/test_invoker/test_pipeline_manager.rb +25 -8
- data/lib/ceedling/test_invoker/test_runner_generatinator.rb +31 -3
- data/lib/ceedling/test_invoker/test_search_paths.rb +30 -8
- data/lib/ceedling/test_invoker/test_source_file_directive_resolver.rb +40 -20
- data/lib/ceedling/test_invoker/test_substitutions.rb +72 -0
- data/lib/ceedling/tools/shell_quoting.rb +45 -0
- data/lib/ceedling/{tool_executor.rb → tools/tool_executor.rb} +9 -3
- data/lib/ceedling/tools/tool_quoting.rb +79 -0
- data/lib/ceedling/{tool_validator.rb → tools/tool_validator.rb} +18 -7
- data/lib/ceedling/yaml_wrapper.rb +3 -2
- data/lib/version.rb +1 -1
- data/plugins/bullseye/bullseye.rake +1 -3
- data/plugins/bullseye/config/defaults_bullseye.rb +1 -1
- data/plugins/bullseye/lib/bullseye.rb +24 -9
- data/plugins/command_hooks/lib/command_hooks.rb +1 -1
- data/plugins/cppcheck/config/defaults_cppcheck.rb +1 -1
- data/plugins/dependencies/config/defaults.yml +6 -6
- data/plugins/dependencies/dependencies.rake +4 -1
- data/plugins/dependencies/lib/dependencies.rb +18 -8
- data/plugins/dependencies/lib/dependency_spec.rb +17 -5
- data/plugins/fff/lib/fff.rb +79 -46
- data/plugins/fff/lib/fff_mock_generator.rb +12 -9
- data/plugins/fff/spec/fff_cmock_wrapper_spec.rb +262 -0
- data/plugins/fff/spec/fff_mock_header_generator_spec.rb +9 -0
- data/plugins/fff/spec/fff_mock_source_generator_spec.rb +20 -0
- data/plugins/gcov/config/defaults_gcov.rb +1 -1
- data/plugins/gcov/lib/console_reportinator.rb +28 -36
- data/plugins/gcov/lib/gcov.rb +9 -2
- data/plugins/gcov/lib/gcovr_reportinator.rb +8 -40
- data/plugins/gcov/lib/gcovr_thresholds.rb +74 -0
- data/plugins/gcov/lib/reportgenerator_reportinator.rb +3 -2
- data/plugins/module_generator/lib/module_generator.rb +3 -3
- data/plugins/report_tests_teamcity_stdout/lib/report_tests_teamcity_stdout.rb +53 -80
- data/plugins/sanitize/lib/sanitize_records.rb +3 -6
- data/plugins/valgrind/lib/valgrind.rb +14 -7
- data/site-local/404.html +2 -2
- data/site-local/assets/javascripts/{bundle.c21346df.min.js → bundle.a5f9d56c.min.js} +1 -1
- data/site-local/assets/javascripts/{bundle.c21346df.min.js.map → bundle.a5f9d56c.min.js.map} +2 -2
- data/site-local/configuration/environment-vars.html +2 -2
- data/site-local/configuration/global-collections.html +3 -3
- data/site-local/configuration/index.html +2 -2
- data/site-local/configuration/loading.html +2 -2
- data/site-local/configuration/mixins.html +2 -2
- data/site-local/configuration/parallel-builds.html +2 -2
- data/site-local/configuration/project-file.html +2 -2
- data/site-local/configuration/reference/cexception.html +2 -2
- data/site-local/configuration/reference/cmock.html +7 -3
- data/site-local/configuration/reference/defines.html +2 -2
- data/site-local/configuration/reference/environment.html +2 -2
- data/site-local/configuration/reference/extension.html +2 -2
- data/site-local/configuration/reference/files.html +65 -12
- data/site-local/configuration/reference/flags.html +2 -2
- data/site-local/configuration/reference/index.html +2 -2
- data/site-local/configuration/reference/libraries.html +23 -5
- data/site-local/configuration/reference/mixins.html +2 -2
- data/site-local/configuration/reference/partials.html +84 -2
- data/site-local/configuration/reference/paths.html +36 -8
- data/site-local/configuration/reference/plugins.html +2 -2
- data/site-local/configuration/reference/project.html +264 -12
- data/site-local/configuration/reference/release-build.html +4 -2
- data/site-local/configuration/reference/test-build.html +2 -2
- data/site-local/configuration/reference/test-runner.html +2 -2
- data/site-local/configuration/reference/tools.html +58 -4
- data/site-local/configuration/reference/unity.html +2 -2
- data/site-local/configuration/which-ceedling.html +379 -19
- data/site-local/development/index.html +2 -2
- data/site-local/development/plugins/configuration.html +2 -2
- data/site-local/development/plugins/index.html +2 -2
- data/site-local/development/plugins/plugin-subclass.html +5 -4
- data/site-local/development/plugins/rake-tasks.html +2 -2
- data/site-local/development/releases.html +7 -3
- data/site-local/development/workflow.html +50 -45
- data/site-local/getting-started/builds.html +4 -2
- data/site-local/getting-started/command-line.html +58 -6
- data/site-local/getting-started/example-projects/cipher-quest.html +2 -2
- data/site-local/getting-started/example-projects/index.html +2 -2
- data/site-local/getting-started/example-projects/temp-sensor.html +2 -2
- data/site-local/getting-started/example-projects/wondrous-forest.html +10 -2
- data/site-local/getting-started/index.html +2 -2
- data/site-local/getting-started/installation.html +2 -2
- data/site-local/getting-started/quick-start.html +2 -2
- data/site-local/help.html +2 -2
- data/site-local/index.html +2 -2
- data/site-local/overview/build-system.html +2 -2
- data/site-local/overview/index.html +2 -2
- data/site-local/overview/test-environments.html +2 -2
- data/site-local/overview/tools-and-frameworks.html +2 -2
- data/site-local/plugins/beep.html +2 -2
- data/site-local/plugins/bullseye/index.html +45 -38
- data/site-local/plugins/bullseye/licensing.html +2 -2
- data/site-local/plugins/command-hooks.html +4 -4
- data/site-local/plugins/compile-commands-json-db.html +2 -2
- data/site-local/plugins/cppcheck.html +2 -2
- data/site-local/plugins/dependencies.html +8 -5
- data/site-local/plugins/fff.html +58 -13
- data/site-local/plugins/gcov/examples.html +2 -2
- data/site-local/plugins/gcov/gcovr.html +23 -14
- data/site-local/plugins/gcov/index.html +2 -2
- data/site-local/plugins/gcov/overview.html +2 -2
- data/site-local/plugins/gcov/reportgenerator.html +18 -14
- data/site-local/plugins/gcov/reporting.html +2 -2
- data/site-local/plugins/gcov/setup.html +4 -3
- data/site-local/plugins/gcov/tool-versions.html +2 -2
- data/site-local/plugins/gcov/troubleshooting.html +2 -2
- data/site-local/plugins/index.html +2 -2
- data/site-local/plugins/module-generator.html +2 -2
- data/site-local/plugins/report-build-warnings-log.html +2 -2
- data/site-local/plugins/report-tests-gtestlike-stdout.html +2 -2
- data/site-local/plugins/report-tests-ide-stdout.html +2 -2
- data/site-local/plugins/report-tests-log-factory.html +2 -2
- data/site-local/plugins/report-tests-pretty-stdout.html +2 -2
- data/site-local/plugins/report-tests-raw-output-log.html +5 -3
- data/site-local/plugins/report-tests-teamcity-stdout.html +8 -5
- data/site-local/plugins/sanitize.html +9 -8
- data/site-local/plugins/valgrind.html +10 -9
- data/site-local/project/index.html +2 -2
- data/site-local/project/release-history.html +2 -2
- data/site-local/project/sbom.html +2 -2
- data/site-local/project/upgrade.html +5 -2
- data/site-local/reference/build-directives.html +2 -2
- data/site-local/reference/command-line.html +11 -4
- data/site-local/reference/environment-vars.html +2 -2
- data/site-local/reference/gcov-plugin.html +2 -2
- data/site-local/reference/global-collections.html +12 -12
- data/site-local/reference/index.html +2 -2
- data/site-local/reference/partials-macros.html +47 -2
- data/site-local/reference/project-configuration.html +2 -2
- data/site-local/sitemap.xml.gz +0 -0
- data/site-local/snapshot/examples/cipher_quest/index.html +2 -2
- data/site-local/snapshot/examples/temp_sensor/index.html +2 -2
- data/site-local/snapshot/examples/wondrous_forest/index.html +72 -15
- data/site-local/snapshot/plugins/bullseye/config/defaults_bullseye.rb +1 -1
- data/site-local/snapshot/plugins/gcov/config/defaults_gcov.rb +1 -1
- data/site-local/testing-guide/build-directives.html +2 -2
- data/site-local/testing-guide/conventions.html +113 -15
- data/site-local/testing-guide/frameworks.html +2 -2
- data/site-local/testing-guide/index.html +2 -2
- data/site-local/testing-guide/partials/configuration.html +31 -4
- data/site-local/testing-guide/partials/conventions.html +509 -8
- data/site-local/testing-guide/partials/directives.html +4 -3
- data/site-local/testing-guide/partials/example.html +2 -2
- data/site-local/testing-guide/partials/index.html +2 -2
- data/site-local/testing-guide/partials/overview.html +30 -12
- data/site-local/testing-guide/partials/variables.html +169 -4
- data/site-local/testing-guide/test-cases.html +2 -2
- data/site-local/testing-guide/test-sample.html +2 -2
- data/site-local/testing-guide/test-suite-anatomy.html +2 -2
- data/spec/integration/actionator_file_operations_spec.rb +91 -1
- data/spec/integration/build_step_doctor_spec.rb +270 -0
- data/spec/integration/c_extractor_composition_spec.rb +254 -4
- data/spec/integration/compile_commands_json_db_spec.rb +1 -1
- data/spec/integration/configurator_validation_spec.rb +1 -1
- data/spec/integration/dependencies/dependency_tracker_cache_hardening_spec.rb +26 -0
- data/spec/integration/dependencies/dependency_tracker_core_spec.rb +22 -0
- data/spec/integration/includes_extraction_spec.rb +27 -14
- data/spec/integration/launcher_handoff_spec.rb +297 -0
- data/spec/integration/mixin_loading_spec.rb +1 -1
- data/spec/integration/module_generator_spec.rb +3 -3
- data/spec/integration/nested_test_artifacts_spec.rb +99 -0
- data/spec/integration/partial_files_preprocessing_spec.rb +128 -0
- data/spec/integration/partials_carry_spec.rb +520 -0
- data/spec/integration/partials_declarations_spec.rb +655 -0
- data/spec/integration/partials_fallback_preprocessing_spec.rb +65 -0
- data/spec/integration/partials_function_pointers_spec.rb +277 -0
- data/spec/integration/partials_header_composition_spec.rb +268 -35
- data/spec/integration/partials_macro_decorators_spec.rb +267 -0
- data/spec/integration/partials_module_resolution_spec.rb +33 -23
- data/spec/integration/partials_symbol_linkage_spec.rb +13 -0
- data/spec/integration/path_intake_scenarios_spec.rb +101 -0
- data/spec/integration/path_length_reporting_spec.rb +64 -0
- data/spec/integration/path_scenarios_spec.rb +399 -0
- data/spec/integration/quote_include_isolator_spec.rb +57 -1
- data/spec/integration/report_build_warnings_log_spec.rb +1 -1
- data/spec/integration/report_tests_log_factory_spec.rb +1 -1
- data/spec/integration/test_build_parallel_barrier_spec.rb +1 -1
- data/spec/integration/test_executable_manifest_spec.rb +1 -1
- data/spec/integration/test_includes_extractinator_spec.rb +69 -3
- data/spec/integration/test_naming_spec.rb +201 -0
- data/spec/integration/test_source_file_checks_spec.rb +168 -0
- data/spec/integration/tool_executor_spec.rb +1 -1
- data/spec/integration/tool_validator_spec.rb +3 -3
- data/spec/integration/upgrade_docs_spec.rb +84 -0
- data/spec/integration/vendor_copy_transient_io_retry_spec.rb +74 -5
- data/spec/integration/win_long_paths_probe_spec.rb +46 -0
- data/spec/integration/win_path_limit_spec.rb +53 -0
- data/spec/integration/windows_registry_query_tool_spec.rb +41 -0
- data/spec/support/file_tree_helper.rb +88 -0
- data/spec/support/integration/configurator_integration_helper.rb +14 -9
- data/spec/support/integration/dependency_tracker_integration_helper.rb +1 -1
- data/spec/support/integration/partial_files_harness.rb +181 -0
- data/spec/support/integration/partials_generation_integration_helper.rb +239 -143
- data/spec/support/integration/path_scenario_harness.rb +175 -0
- data/spec/support/integration/spec_integration_helper.rb +9 -4
- data/spec/support/integration/test_includes_harness.rb +69 -37
- data/spec/support/integration/tool_executor_integration_helper.rb +14 -2
- data/spec/support/spec_helper.rb +2 -0
- data/spec/support/system/spec_system_helper.rb +7 -6
- data/spec/support/system/system_context.rb +21 -3
- data/spec/support/working_dir_tracking.rb +49 -0
- data/spec/system/build_output_mirroring_spec.rb +2 -2
- data/spec/system/bullseye_deployment_spec.rb +2 -0
- data/spec/system/conditional_mock_includes_spec.rb +1 -1
- data/spec/system/delta_builds_spec.rb +163 -23
- data/spec/system/encoding_stress_spec.rb +4 -4
- data/spec/system/example_wondrous_forest_spec.rb +2 -2
- data/spec/system/gcov_deployment_spec.rb +3 -0
- data/spec/system/header_include_path_validation_spec.rb +4 -4
- data/spec/system/header_search_paths_spec.rb +1083 -0
- data/spec/system/launcher_handoff_spec.rb +82 -0
- data/spec/system/mock_include_folders_spec.rb +212 -0
- data/spec/system/mockable_header_reassembly_spec.rb +184 -0
- data/spec/system/parent_directory_reference_spec.rb +5 -3
- data/spec/system/partials_carry_spec.rb +581 -0
- data/spec/system/partials_delta_builds_spec.rb +280 -0
- data/spec/system/partials_function_pointers_spec.rb +106 -0
- data/spec/system/partials_macro_decorators_spec.rb +127 -0
- data/spec/system/partials_module_disambiguation_spec.rb +125 -0
- data/spec/system/path_handling_probes_spec.rb +196 -0
- data/spec/system/pinned_thread_count_spec.rb +4 -4
- data/spec/system/preprocessing_fallback_conditionals_spec.rb +1 -1
- data/spec/system/preprocessing_parameterized_tests_spec.rb +1 -1
- data/spec/system/rake_release_task_path_disambiguation_spec.rb +6 -6
- data/spec/system/rake_test_task_path_disambiguation_spec.rb +85 -0
- data/spec/system/short_build_paths_spec.rb +87 -0
- data/spec/system/sibling_header_collision_spec.rb +30 -6
- data/spec/system/special_path_characters_spec.rb +86 -0
- data/spec/system/support/bullseye_common_test_cases.rb +42 -0
- data/spec/system/support/common_test_cases.rb +23 -21
- data/spec/system/support/gcov_common_test_cases.rb +37 -9
- data/spec/system/support/gcov_partials_test_cases.rb +48 -0
- data/spec/system/support/sanitize_common_test_cases.rb +2 -2
- data/spec/system/support/valgrind_common_test_cases.rb +12 -12
- data/spec/system/test_build_layout_spec.rb +209 -0
- data/spec/system/test_pipeline_stop_points_spec.rb +4 -4
- data/spec/system/test_runner_system_include_spec.rb +1 -1
- data/spec/system/test_source_file_directive_spec.rb +64 -5
- data/spec/units/bin/actionator_spec.rb +14 -17
- data/spec/units/bin/app_cfg_spec.rb +37 -0
- data/spec/units/bin/cli_handler_spec.rb +282 -6
- data/spec/units/bin/cli_helper_spec.rb +116 -45
- data/spec/units/bin/installation_selector_spec.rb +114 -0
- data/spec/units/bin/launchinator_spec.rb +171 -0
- data/spec/units/bin/path_validator_spec.rb +10 -0
- data/spec/units/bin/versionator_spec.rb +38 -6
- data/spec/units/build_log_writer_spec.rb +57 -0
- data/spec/units/c_extractor/c_extractor_code_text_spec.rb +67 -10
- data/spec/units/c_extractor/c_extractor_declarations_spec.rb +501 -4
- data/spec/units/c_extractor/c_extractor_declarator_spec.rb +245 -0
- data/spec/units/c_extractor/c_extractor_defined_type_spec.rb +45 -0
- data/spec/units/c_extractor/c_extractor_definitions_spec.rb +163 -3
- data/spec/units/c_extractor/c_extractor_functions_spec.rb +462 -21
- data/spec/units/c_extractor/c_extractor_preprocessing_spec.rb +39 -0
- data/spec/units/c_extractor/c_extractor_spec.rb +4 -4
- data/spec/units/c_extractor/c_extractor_types_spec.rb +163 -0
- data/spec/units/c_identifier_spec.rb +35 -0
- data/spec/units/config/build_root_policy_spec.rb +61 -0
- data/spec/units/config/configurator_builder_spec.rb +61 -6
- data/spec/units/config/configurator_paths_validator_spec.rb +292 -0
- data/spec/units/config/configurator_setup_spec.rb +80 -68
- data/spec/units/config/configurator_spec.rb +54 -6
- data/spec/units/config/configurator_validator_spec.rb +1 -172
- data/spec/units/dependencies/dependency_cache_store_spec.rb +98 -2
- data/spec/units/dependencies/dependency_debug_tree_spec.rb +1 -1
- data/spec/units/dependencies/dependency_hasher_spec.rb +42 -1
- data/spec/units/dependencies/dependency_path_normalizer_spec.rb +1 -1
- data/spec/units/dependencies/dependency_tracker_spec.rb +28 -1
- data/spec/units/dependencies/dependinator_spec.rb +17 -2
- data/spec/units/diagnostics/build_step_doctor_spec.rb +170 -0
- data/spec/units/diagnostics/duplicate_symbol_specialist_spec.rb +117 -0
- data/spec/units/diagnostics/header_collision_specialist_spec.rb +267 -0
- data/spec/units/diagnostics/include_depth_specialist_spec.rb +137 -0
- data/spec/units/diagnostics/missing_symbol_specialist_spec.rb +154 -0
- data/spec/units/diagnostics/partial_name_specialist_spec.rb +129 -0
- data/spec/units/diagnostics/toolchain_output_spec.rb +86 -0
- data/spec/units/encodinator_spec.rb +3 -4
- data/spec/units/filename_extension_spec.rb +11 -0
- data/spec/units/filesystem/build_roots_spec.rb +131 -0
- data/spec/units/filesystem/build_subpath_spec.rb +235 -0
- data/spec/units/filesystem/destination_collision_spec.rb +30 -0
- data/spec/units/{file_finder_helper_spec.rb → filesystem/file_finder_helper_spec.rb} +126 -1
- data/spec/units/filesystem/file_finder_spec.rb +845 -0
- data/spec/units/{file_path_collection_utils_spec.rb → filesystem/file_path_collection_utils_spec.rb} +181 -1
- data/spec/units/{file_path_utils_spec.rb → filesystem/file_path_utils_spec.rb} +435 -185
- data/spec/units/filesystem/file_system_wrapper_spec.rb +33 -0
- data/spec/units/filesystem/file_tree_spec.rb +511 -0
- data/spec/units/filesystem/file_tree_windows_spec.rb +78 -0
- data/spec/units/{file_wrapper_spec.rb → filesystem/file_wrapper_spec.rb} +286 -18
- data/spec/units/{path_matcher_spec.rb → filesystem/path_matcher_spec.rb} +48 -1
- data/spec/units/{path_mirror_spec.rb → filesystem/path_mirror_spec.rb} +32 -4
- data/spec/units/filesystem/project_paths_spec.rb +147 -0
- data/spec/units/filesystem/test_build_layout_spec.rb +216 -0
- data/spec/units/filesystem/win_long_paths_spec.rb +204 -0
- data/spec/units/filesystem/win_path_prober_spec.rb +158 -0
- data/spec/units/filesystem/working_dir_spec.rb +71 -0
- data/spec/units/generators/generator_helper_spec.rb +0 -60
- data/spec/units/generators/generator_mocks_spec.rb +13 -0
- data/spec/units/generators/generator_partials_spec.rb +656 -55
- data/spec/units/generators/generator_spec.rb +38 -6
- data/spec/units/generators/generator_test_results_backtrace_spec.rb +50 -46
- data/spec/units/generators/generator_test_results_spec.rb +1 -1
- data/spec/units/generators/generator_test_runner_spec.rb +9 -5
- data/spec/units/generators/partial_source_writer_spec.rb +129 -0
- data/spec/units/handoff_spec.rb +205 -0
- data/spec/units/includes/header_search_spec.rb +406 -0
- data/spec/units/includes/include_factory_spec.rb +23 -6
- data/spec/units/includes/include_pathinator_spec.rb +118 -8
- data/spec/units/includes/include_spec.rb +14 -0
- data/spec/units/includes/includes_spec.rb +176 -19
- data/spec/units/installation_spec.rb +228 -0
- data/spec/units/library_resolver_spec.rb +157 -0
- data/spec/units/loginator_spec.rb +31 -0
- data/spec/units/mock_locator_spec.rb +275 -6
- data/spec/units/partials/include_groups_spec.rb +42 -0
- data/spec/units/partials/partializer_config_spec.rb +32 -0
- data/spec/units/partials/partializer_helper_carry_spec.rb +661 -0
- data/spec/units/partials/partializer_helper_interface_extras_spec.rb +396 -0
- data/spec/units/partials/partializer_helper_spec.rb +529 -277
- data/spec/units/partials/partializer_reconciler_spec.rb +661 -0
- data/spec/units/partials/partializer_spec.rb +1579 -270
- data/spec/units/partials/partializer_utils_spec.rb +269 -232
- data/spec/units/partials/partials_rename_spec.rb +160 -0
- data/spec/units/partials_manager_spec.rb +561 -251
- data/spec/units/plugins/bullseye_spec.rb +49 -2
- data/spec/units/plugins/console_reportinator_spec.rb +73 -26
- data/spec/units/plugins/dependencies_spec.rb +33 -7
- data/spec/units/plugins/dependency_spec_spec.rb +17 -0
- data/spec/units/plugins/gcov_spec.rb +28 -3
- data/spec/units/plugins/gcovr_reportinator_spec.rb +19 -47
- data/spec/units/plugins/gcovr_thresholds_spec.rb +95 -0
- data/spec/units/plugins/module_generator_spec.rb +5 -5
- data/spec/units/plugins/report_build_warnings_log_spec.rb +3 -3
- data/spec/units/plugins/report_log_writer_plugin_spec.rb +10 -1
- data/spec/units/plugins/report_tests_raw_output_log_spec.rb +13 -2
- data/spec/units/plugins/report_tests_teamcity_stdout_spec.rb +77 -3
- data/spec/units/plugins/reportgenerator_reportinator_spec.rb +52 -4
- data/spec/units/plugins/sanitize_records_spec.rb +3 -1
- data/spec/units/plugins/sanitize_spec.rb +1 -1
- data/spec/units/plugins/valgrind_spec.rb +23 -8
- data/spec/units/preprocess/preprocessinator_code_finder_spec.rb +73 -10
- data/spec/units/preprocess/preprocessinator_comment_stripper_spec.rb +1 -1
- data/spec/units/preprocess/preprocessinator_file_assembler_spec.rb +125 -37
- data/spec/units/preprocess/preprocessinator_includes_handler_spec.rb +15 -0
- data/spec/units/preprocess/preprocessinator_reconstructor_spec.rb +197 -0
- data/spec/units/preprocess/preprocessinator_spec.rb +153 -95
- data/spec/units/rake_app/rakefile_component_resolver_spec.rb +21 -0
- data/spec/units/release_build_executor_spec.rb +53 -14
- data/spec/units/release_build_planner_spec.rb +15 -3
- data/spec/units/reportinator_spec.rb +5 -5
- data/spec/units/setupinator_spec.rb +51 -0
- data/spec/units/standin_headerinator_spec.rb +55 -9
- data/spec/units/test_build_executor_spec.rb +842 -166
- data/spec/units/test_build_planner_spec.rb +205 -15
- data/spec/units/test_build_setup_spec.rb +179 -30
- data/spec/units/test_context_extractor_spec.rb +36 -2
- data/spec/units/test_derived_search_paths_spec.rb +259 -0
- data/spec/units/test_file_preprocessinator_spec.rb +17 -1
- data/spec/units/test_includes_extractinator_spec.rb +61 -9
- data/spec/units/test_invoker/objects_wiring_spec.rb +24 -4
- data/spec/units/test_invoker/partial_files_preprocessinator_spec.rb +264 -0
- data/spec/units/test_invoker/test_substitutions_spec.rb +122 -0
- data/spec/units/test_invoker_spec.rb +14 -1
- data/spec/units/test_invoker_types_spec.rb +8 -7
- data/spec/units/test_pipeline_manager_spec.rb +54 -13
- data/spec/units/test_runner_generatinator_spec.rb +93 -1
- data/spec/units/test_search_paths_spec.rb +73 -5
- data/spec/units/test_source_file_directive_resolver_spec.rb +38 -7
- data/spec/units/tools/default_tools_quoting_spec.rb +117 -0
- data/spec/units/tools/shell_quoting_spec.rb +76 -0
- data/spec/units/{tool_executor_helper_spec.rb → tools/tool_executor_helper_spec.rb} +1 -1
- data/spec/units/{tool_executor_spec.rb → tools/tool_executor_spec.rb} +27 -1
- data/spec/units/{tool_validator_spec.rb → tools/tool_validator_spec.rb} +110 -1
- data/spec/units/windows_registry_query_tool_spec.rb +53 -0
- data/spec/units/yaml_wrapper_spec.rb +11 -0
- metadata +265 -36
- data/lib/ceedling/file_finder_helper.rb +0 -127
- data/lib/ceedling/file_path_collection_utils.rb +0 -164
- data/spec/units/file_finder_spec.rb +0 -495
- /data/lib/ceedling/{tool_executor_helper.rb → tools/tool_executor_helper.rb} +0 -0
|
@@ -5,19 +5,13 @@
|
|
|
5
5
|
# SPDX-License-Identifier: MIT
|
|
6
6
|
# =========================================================================
|
|
7
7
|
|
|
8
|
+
require 'ceedling/c_extractor/c_extractor_statement'
|
|
9
|
+
|
|
8
10
|
module CExtractorTypes
|
|
9
11
|
|
|
10
|
-
#
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
:text, # String — raw extracted statement text (comments replaced with spaces)
|
|
14
|
-
:line_num, # Integer — 1-based line number where the statement begins in the source file
|
|
15
|
-
keyword_init: true
|
|
16
|
-
) do
|
|
17
|
-
def initialize(text: nil, line_num: nil)
|
|
18
|
-
super
|
|
19
|
-
end
|
|
20
|
-
end unless const_defined?(:CStatement, false)
|
|
12
|
+
# Each CModule statement list's kind, which a statement in it takes (see CStatement#kind)
|
|
13
|
+
STATEMENT_KINDS = { macro_definitions: :macro, type_definitions: :typedef, aggregate_definitions: :aggregate,
|
|
14
|
+
macro_invocations: :invocation }.freeze unless const_defined?(:STATEMENT_KINDS, false)
|
|
21
15
|
|
|
22
16
|
# Data class representing all extracted content of C module
|
|
23
17
|
CModule = Struct.new(
|
|
@@ -26,28 +20,28 @@ module CExtractorTypes
|
|
|
26
20
|
:function_declarations, # Array of CFunctionDeclaration structs (each with :line_num)
|
|
27
21
|
:macro_definitions, # Array of CStatement — raw #define text with source line number
|
|
28
22
|
:type_definitions, # Array of CStatement — raw typedef text with source line number
|
|
29
|
-
:aggregate_definitions, # Array of CStatement — raw non-typedef struct/enum/union text with source line number
|
|
23
|
+
:aggregate_definitions, # Array of CStatement — raw non-typedef struct/enum/union text with source line number, a struct or
|
|
24
|
+
# union forward declaration, or a type a variable declaration defines (see CVariableDeclaration#defined_type)
|
|
30
25
|
:macro_invocations, # Array of CStatement — raw bare, top-level, semicolon-less macro-invocation text (e.g. an x-macro call) with source line number
|
|
31
26
|
:element_sequence, # Array of references to all items above in extraction order (cross-type ordering index)
|
|
32
27
|
keyword_init: true
|
|
33
28
|
) do
|
|
34
|
-
# Constructor to set unassigned fields to empty arrays for convenience
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
function_declarations: [],
|
|
39
|
-
macro_definitions: [],
|
|
40
|
-
type_definitions: [],
|
|
41
|
-
aggregate_definitions: [],
|
|
42
|
-
macro_invocations: [],
|
|
43
|
-
element_sequence: []
|
|
44
|
-
)
|
|
29
|
+
# Constructor to set unassigned fields to empty arrays for convenience. A statement without a
|
|
30
|
+
# kind takes its list's, so a statement's kind always says which list holds it.
|
|
31
|
+
def initialize(variable_declarations: [], function_definitions: [], function_declarations: [], macro_definitions: [],
|
|
32
|
+
type_definitions: [], aggregate_definitions: [], macro_invocations: [], element_sequence: [])
|
|
45
33
|
super
|
|
34
|
+
STATEMENT_KINDS.each { |list, kind| self[list].each { |statement| statement.kind ||= kind } }
|
|
35
|
+
end
|
|
36
|
+
|
|
37
|
+
# Whether the module defines or names any type, which a Partial's types header then holds
|
|
38
|
+
def types?
|
|
39
|
+
return !(type_definitions.empty? and aggregate_definitions.empty?)
|
|
46
40
|
end
|
|
47
41
|
|
|
48
42
|
# Concatenate two CModule instances.
|
|
49
|
-
# element_sequence
|
|
50
|
-
#
|
|
43
|
+
# element_sequence keeps the first operand's items ahead of the second operand's items.
|
|
44
|
+
# Partials merges a header and then its source, so header items come first.
|
|
51
45
|
def +(other)
|
|
52
46
|
CModule.new(
|
|
53
47
|
variable_declarations: (self.variable_declarations + other.variable_declarations),
|
|
@@ -60,6 +54,14 @@ module CExtractorTypes
|
|
|
60
54
|
element_sequence: (self.element_sequence + other.element_sequence)
|
|
61
55
|
)
|
|
62
56
|
end
|
|
57
|
+
|
|
58
|
+
# Records which file of a module each item came from.
|
|
59
|
+
# CExtractor reads text alone and cannot know a file's role, so the caller stamps it.
|
|
60
|
+
# element_sequence references these same objects and so reflects the stamp too.
|
|
61
|
+
def stamp_origin!(origin)
|
|
62
|
+
(function_definitions + function_declarations + element_sequence).each { |item| item.origin = origin }
|
|
63
|
+
return self
|
|
64
|
+
end
|
|
63
65
|
end unless const_defined?(:CModule, false)
|
|
64
66
|
|
|
65
67
|
# Data class representing an extracted C function declaration
|
|
@@ -69,9 +71,12 @@ module CExtractorTypes
|
|
|
69
71
|
:decorators, # Array of decorator strings (e.g., ["static"])
|
|
70
72
|
:signature_stripped, # Signature without decorators (e.g., "int foo(void);")
|
|
71
73
|
:line_num, # Integer — 1-based line number in source file where declaration begins
|
|
74
|
+
:source_filepath, # Original file the declaration was located in, when a caller locates it
|
|
75
|
+
:origin, # :header or :source when the caller knows the file's role, otherwise nil
|
|
76
|
+
:inline_elsewhere, # True when the module never defines the function and a header the declaring file includes defines it inline
|
|
72
77
|
keyword_init: true
|
|
73
78
|
) do
|
|
74
|
-
def initialize(name: nil, signature: nil, decorators: [], signature_stripped: nil, line_num: nil)
|
|
79
|
+
def initialize(name: nil, signature: nil, decorators: [], signature_stripped: nil, line_num: nil, source_filepath: nil, origin: nil, inline_elsewhere: false)
|
|
75
80
|
super
|
|
76
81
|
end
|
|
77
82
|
end unless const_defined?(:CFunctionDeclaration, false)
|
|
@@ -87,20 +92,15 @@ module CExtractorTypes
|
|
|
87
92
|
:line_num, # Line number in source C file
|
|
88
93
|
:decorators, # Array of decorator strings (e.g., ["static"])
|
|
89
94
|
:signature_stripped, # Signature without decorators (e.g., "int foo(void)")
|
|
95
|
+
:origin, # :header or :source when the caller knows the file's role, otherwise nil
|
|
96
|
+
:expanded_body, # Body with every macro expanded, taken from the full expansion copy when one exists
|
|
97
|
+
:hidden_decorators, # Decorators only the full expansion shows, since a macro spells them
|
|
90
98
|
keyword_init: true
|
|
91
99
|
) do
|
|
92
100
|
# Constructor to set unassigned fields to nil for convenience
|
|
93
|
-
def initialize(
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
body: nil,
|
|
97
|
-
code_block: nil,
|
|
98
|
-
line_count: 0,
|
|
99
|
-
source_filepath: nil,
|
|
100
|
-
line_num: nil,
|
|
101
|
-
decorators: [],
|
|
102
|
-
signature_stripped: nil
|
|
103
|
-
)
|
|
101
|
+
def initialize(name: nil, signature: nil, body: nil, code_block: nil, line_count: 0, source_filepath: nil,
|
|
102
|
+
line_num: nil, decorators: [], signature_stripped: nil, origin: nil, expanded_body: nil,
|
|
103
|
+
hidden_decorators: [])
|
|
104
104
|
super
|
|
105
105
|
end
|
|
106
106
|
end unless const_defined?(:CFunctionDefinition, false)
|
|
@@ -110,16 +110,38 @@ module CExtractorTypes
|
|
|
110
110
|
:original, # Full original C text (e.g., "static int x, y;") -- shared by all Structs
|
|
111
111
|
# created from a single compound declaration.
|
|
112
112
|
:name, # Variable name (e.g., "x") -- array subscripts stripped
|
|
113
|
-
:type, # Type without decorator keywords (e.g., "int", "char*") -- array subscripts stripped
|
|
114
|
-
|
|
113
|
+
:type, # Type without decorator keywords (e.g., "int", "char*") -- array subscripts stripped.
|
|
114
|
+
# With a declarator, only the text ahead of it (e.g., "int" for "int (*hook)(int)").
|
|
115
|
+
# Only what follows the type when the declaration defines it (see :defined_type), as "*" or "".
|
|
116
|
+
:array_suffix, # Array subscript string (e.g., "[8]", "[M][N]", "" for scalars). "" with a
|
|
117
|
+
# declarator, which keeps any subscripts itself.
|
|
115
118
|
:decorators, # Array of decorator keyword strings (e.g., ["static", "const"])
|
|
116
|
-
:text, # Cleaned declaration without decorators, whitespace normalized (e.g., "int x;")
|
|
119
|
+
:text, # Cleaned declaration without decorators, whitespace normalized (e.g., "int x;"). Without
|
|
120
|
+
# its type when the declaration defines one (e.g., "s_ctx = { 1 };").
|
|
117
121
|
:line_num, # Integer — 1-based line number in source file where declaration begins
|
|
122
|
+
:declarator, # A parenthesized declarator from its '(' onward (e.g., "(*hook)(int)" after type "int"), or nil
|
|
123
|
+
:asm_label, # An asm label naming the symbol (e.g., '__asm__("g_symbol")'), or nil. :text and :original hold it too.
|
|
124
|
+
# A file-scope basic asm statement, such as `asm(".globl x");`, has no name and holds itself here.
|
|
125
|
+
:origin, # :header or :source when the caller knows the file's role, otherwise nil
|
|
126
|
+
:defined_type, # The CStatement for a type the declaration defines, as `struct { int count; }` in
|
|
127
|
+
# `static struct { int count; } s_ctx;`, shared by every variable it declares. Otherwise nil.
|
|
128
|
+
:promoted_from, # The name of the function a promoted function-scope static came from, otherwise nil
|
|
129
|
+
:expanded_text, # :text as the full expansion spells it, every macro expanded, or nil before reconciliation.
|
|
130
|
+
# Every twin's text, joined, when fallback left the name written more often than expanded.
|
|
118
131
|
keyword_init: true
|
|
119
132
|
) do
|
|
120
|
-
def initialize(original: nil, name: nil, type: nil, array_suffix: '', decorators: [], text: nil, line_num: nil
|
|
133
|
+
def initialize(original: nil, name: nil, type: nil, array_suffix: '', decorators: [], text: nil, line_num: nil, declarator: nil,
|
|
134
|
+
asm_label: nil, origin: nil, defined_type: nil, promoted_from: nil, expanded_text: nil)
|
|
121
135
|
super
|
|
122
136
|
end
|
|
137
|
+
|
|
138
|
+
# A variable declared `extern` lives in another file, which holds its definition
|
|
139
|
+
def extern?
|
|
140
|
+
return decorators.include?( 'extern' )
|
|
141
|
+
end
|
|
123
142
|
end unless const_defined?(:CVariableDeclaration, false)
|
|
124
143
|
|
|
125
144
|
end
|
|
145
|
+
|
|
146
|
+
# Loaded last, since it reopens CModule above
|
|
147
|
+
require 'ceedling/c_extractor/c_module_edits'
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
# =========================================================================
|
|
2
|
+
# Ceedling - Test-Centered Build System for C
|
|
3
|
+
# ThrowTheSwitch.org
|
|
4
|
+
# Copyright (c) 2010-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
|
|
5
|
+
# SPDX-License-Identifier: MIT
|
|
6
|
+
# =========================================================================
|
|
7
|
+
|
|
8
|
+
require 'set'
|
|
9
|
+
|
|
10
|
+
module CExtractorTypes
|
|
11
|
+
|
|
12
|
+
# The list of a CModule that holds each kind of item. A statement's list follows its kind.
|
|
13
|
+
ITEM_LISTS = {
|
|
14
|
+
CVariableDeclaration => :variable_declarations,
|
|
15
|
+
CFunctionDefinition => :function_definitions,
|
|
16
|
+
CFunctionDeclaration => :function_declarations
|
|
17
|
+
}.freeze unless const_defined?(:ITEM_LISTS, false)
|
|
18
|
+
|
|
19
|
+
# Edits that keep a CModule's lists and its element_sequence in step. Each item sits in one
|
|
20
|
+
# list and in element_sequence, so an edit to one must reach the other.
|
|
21
|
+
class CModule
|
|
22
|
+
# Removes `items` from their lists and from element_sequence. Items are matched by identity,
|
|
23
|
+
# since two equal statements can sit in different places.
|
|
24
|
+
def remove!(items)
|
|
25
|
+
gone = Set.new.compare_by_identity.merge( items )
|
|
26
|
+
members.each { |list| self[list].reject! { |item| gone.include?( item ) } }
|
|
27
|
+
return self
|
|
28
|
+
end
|
|
29
|
+
|
|
30
|
+
# Adds `items` to their lists and places them in element_sequence just ahead of `anchor`, or
|
|
31
|
+
# at the end when `anchor` isn't there
|
|
32
|
+
def insert_before!(anchor, items)
|
|
33
|
+
items.each { |item| self[_list_for( item )] << item }
|
|
34
|
+
|
|
35
|
+
at = element_sequence.index { |item| item.equal?( anchor ) } || element_sequence.size
|
|
36
|
+
element_sequence.insert( at, *items )
|
|
37
|
+
return self
|
|
38
|
+
end
|
|
39
|
+
|
|
40
|
+
private
|
|
41
|
+
|
|
42
|
+
def _list_for(item)
|
|
43
|
+
list = item.is_a?( CStatement ) ? STATEMENT_KINDS.key( item.kind ) : ITEM_LISTS[item.class]
|
|
44
|
+
return list || raise( ArgumentError, "No CModule list holds a #{item.class} of kind #{item.respond_to?( :kind ) ? item.kind.inspect : 'none'}" )
|
|
45
|
+
end
|
|
46
|
+
end
|
|
47
|
+
|
|
48
|
+
end
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
# =========================================================================
|
|
2
|
+
# Ceedling - Test-Centered Build System for C
|
|
3
|
+
# ThrowTheSwitch.org
|
|
4
|
+
# Copyright (c) 2010-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
|
|
5
|
+
# SPDX-License-Identifier: MIT
|
|
6
|
+
# =========================================================================
|
|
7
|
+
|
|
8
|
+
# Builds C identifiers from names that may hold characters C does not allow, such as a
|
|
9
|
+
# filename or a module name. Generated include guards and the type names Partials invent
|
|
10
|
+
# share this rule, so one name folds the same way everywhere.
|
|
11
|
+
module CIdentifier
|
|
12
|
+
|
|
13
|
+
# Each character a C identifier cannot hold becomes an underscore, one for one:
|
|
14
|
+
# my-sensor.v2 --> my_sensor_v2. A test author can predict the result from the name
|
|
15
|
+
# alone, which a macro naming a generated identifier relies on. Callers needing more,
|
|
16
|
+
# such as an include guard's squeezed underscores, build on this.
|
|
17
|
+
def self.fold(text)
|
|
18
|
+
return text.gsub( /\W/, '_' )
|
|
19
|
+
end
|
|
20
|
+
|
|
21
|
+
end
|
data/lib/ceedling/ceedling.h
CHANGED
|
@@ -24,6 +24,14 @@
|
|
|
24
24
|
// Create a unique namespaced variable name
|
|
25
25
|
#define PARTIAL_LOCAL_VAR(namespace, var) partial_##namespace##_##var
|
|
26
26
|
|
|
27
|
+
// Name the type a Partial gives a variable declared together with its type, as in
|
|
28
|
+
// `static struct { int count; } s_ctx;`. PARTIAL_LOCAL_TYPE names a promoted function-scope
|
|
29
|
+
// static's. The module is its name alone, without any directory, each character a C identifier
|
|
30
|
+
// cannot hold written as `_`. The module and variable paste before anything expands, so neither
|
|
31
|
+
// is taken for a macro, and the outer join expands the prefix.
|
|
32
|
+
#define PARTIAL_TYPE(module, var) __PARTIALS_JOIN(CEEDLING_PARTIALS_PREFIX, module##_##var##_t)
|
|
33
|
+
#define PARTIAL_LOCAL_TYPE(module, function, var) __PARTIALS_JOIN(CEEDLING_PARTIALS_PREFIX, module##_##function##_##var##_t)
|
|
34
|
+
|
|
27
35
|
//
|
|
28
36
|
// NOTE: These macros expect symbols CMOCK_MOCK_PREFIX and CEEDLING_PARTIALS_PREFIX to be defined at compilation
|
|
29
37
|
//
|
|
@@ -0,0 +1,70 @@
|
|
|
1
|
+
# =========================================================================
|
|
2
|
+
# Ceedling - Test-Centered Build System for C
|
|
3
|
+
# ThrowTheSwitch.org
|
|
4
|
+
# Copyright (c) 2010-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
|
|
5
|
+
# SPDX-License-Identifier: MIT
|
|
6
|
+
# =========================================================================
|
|
7
|
+
|
|
8
|
+
require 'ceedling/filesystem/file_path_utils'
|
|
9
|
+
require 'ceedling/filesystem/project_paths'
|
|
10
|
+
|
|
11
|
+
# What a build root may be, and what in it a build may collect. Clobber empties the
|
|
12
|
+
# directories Ceedling creates in the build root, so the build root names a directory,
|
|
13
|
+
# neither the project directory nor one above it. Collection leaves out the directories
|
|
14
|
+
# Ceedling creates, and a :paths or :files entry within the build root is warned of.
|
|
15
|
+
module BuildRootPolicy
|
|
16
|
+
|
|
17
|
+
# The settings naming the directories Ceedling creates, in the build root or, for mocks,
|
|
18
|
+
# wherever the mock path places them
|
|
19
|
+
CREATED = %i[
|
|
20
|
+
project_build_artifacts_root project_build_tests_root project_build_release_root project_build_vendor_root
|
|
21
|
+
project_build_dependencies_cache_path project_log_path cmock_mock_path
|
|
22
|
+
].freeze
|
|
23
|
+
|
|
24
|
+
# Why `root` is no build root, or nil when it is one. Compared as the places really are,
|
|
25
|
+
# so no symlinked spelling of the project gets by.
|
|
26
|
+
def self.problem(root)
|
|
27
|
+
return 'names no directory' if root.strip.empty?
|
|
28
|
+
return 'is the project directory or holds it' if ProjectPaths.contains?( ProjectPaths.canonical( root ), ProjectPaths.working_dir )
|
|
29
|
+
|
|
30
|
+
return nil
|
|
31
|
+
end
|
|
32
|
+
|
|
33
|
+
# The message refusing `root` for `problem`
|
|
34
|
+
def self.message(root, problem)
|
|
35
|
+
return ":project ↳ :build_root => '#{root}' #{problem}. Give the build its own directory, such as 'build'."
|
|
36
|
+
end
|
|
37
|
+
|
|
38
|
+
# Each :paths and :files entry that adds to a build from within `root`, as
|
|
39
|
+
# [section, key, entry]
|
|
40
|
+
def self.entries_within(root, config)
|
|
41
|
+
real = ProjectPaths.canonical( root )
|
|
42
|
+
return additive_entries( config ).select { |_, _, entry| ProjectPaths.contains?( real, ProjectPaths.canonical( FilePathUtils.no_decorators( entry ) ) ) }
|
|
43
|
+
end
|
|
44
|
+
|
|
45
|
+
# A warning of each :paths and :files entry that adds to a build from within `root`, its
|
|
46
|
+
# place in the configuration spelled by the block
|
|
47
|
+
def self.warnings(root, config)
|
|
48
|
+
return entries_within( root, config ).map do |section, key, entry|
|
|
49
|
+
"#{yield( [section, key] )} => '#{entry}' lies in the build root '#{root}'. Ceedling leaves out the directories it creates there."
|
|
50
|
+
end
|
|
51
|
+
end
|
|
52
|
+
|
|
53
|
+
# The directories Ceedling creates, each enabled plugin's build directory among them, from
|
|
54
|
+
# a flattened configuration. A setting with no path names none.
|
|
55
|
+
def self.reserved(config)
|
|
56
|
+
root = config[:project_build_root].to_s
|
|
57
|
+
plugins = root.empty? ? [] : (config[:plugins_enabled] || []).map { |plugin| File.join( root, File.basename( plugin.to_s ) ) }
|
|
58
|
+
return (CREATED.map { |key| config[key].to_s } + plugins).reject( &:empty? ).uniq
|
|
59
|
+
end
|
|
60
|
+
|
|
61
|
+
# Every :paths and :files entry that adds to a build, as [section, key, entry]
|
|
62
|
+
def self.additive_entries(config)
|
|
63
|
+
entries = [:paths, :files].flat_map do |section|
|
|
64
|
+
(config[section] || {}).flat_map { |key, list| Array( list ).flatten.map { |entry| [section, key, entry] } }
|
|
65
|
+
end
|
|
66
|
+
return entries.select { |_, _, entry| entry.is_a?( String ) and FilePathUtils.add_path?( entry ) }
|
|
67
|
+
end
|
|
68
|
+
private_class_method :additive_entries
|
|
69
|
+
|
|
70
|
+
end
|
|
@@ -7,10 +7,10 @@
|
|
|
7
7
|
|
|
8
8
|
require 'ceedling/defaults'
|
|
9
9
|
require 'ceedling/constants'
|
|
10
|
-
require 'ceedling/file_path_utils'
|
|
10
|
+
require 'ceedling/filesystem/file_path_utils'
|
|
11
11
|
require 'ceedling/exceptions'
|
|
12
12
|
require 'ceedling/rake_app/rakefile_component_resolver'
|
|
13
|
-
require 'ceedling/tool_executor'
|
|
13
|
+
require 'ceedling/tools/tool_executor'
|
|
14
14
|
require 'deep_merge'
|
|
15
15
|
|
|
16
16
|
class Configurator
|
|
@@ -27,8 +27,8 @@ class Configurator
|
|
|
27
27
|
|
|
28
28
|
# Validations of the completed configuration
|
|
29
29
|
FINAL_VALIDATIONS = [
|
|
30
|
-
:validate_paths, :validate_tools, :validate_defines, :validate_flags, :validate_line_markers,
|
|
31
|
-
:validate_test_preprocessor, :validate_backtrace, :validate_threads, :validate_partials, :validate_plugins
|
|
30
|
+
:validate_build_root, :validate_paths, :validate_tools, :validate_defines, :validate_flags, :validate_line_markers,
|
|
31
|
+
:validate_test_preprocessor, :validate_backtrace, :validate_win_path_limit, :validate_threads, :validate_partials, :validate_plugins
|
|
32
32
|
].freeze
|
|
33
33
|
|
|
34
34
|
# CMock and Unity options that test runner generation also reads
|
|
@@ -151,18 +151,11 @@ class Configurator
|
|
|
151
151
|
|
|
152
152
|
|
|
153
153
|
def prepare_plugins_load_paths(plugins_load_path, config)
|
|
154
|
-
# Plugins must be loaded before generic path evaluation & magic that happen later
|
|
155
|
-
#
|
|
156
|
-
#
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
FilePathUtils::standardize_in_place( path )
|
|
160
|
-
end
|
|
161
|
-
|
|
162
|
-
# Delegate list construction to the shared helper (user paths first, built-in last).
|
|
163
|
-
# This mirrors what RakefileComponentResolver.resolve() does in the bin/ CLI scope,
|
|
164
|
-
# ensuring both scopes search plugins in the same priority order.
|
|
165
|
-
config[:plugins][:load_paths] = RakefileComponentResolver.prepare_plugin_load_paths( config, plugins_load_path )
|
|
154
|
+
# Plugins must be loaded before generic path evaluation & magic that happen later, so
|
|
155
|
+
# their load paths are expanded and standardized here, by the helper bin/ shares (user
|
|
156
|
+
# paths first, built-in last), so both scopes search plugins alike.
|
|
157
|
+
expand = ->(path) { @ruby_expandinator.expand( path, source: ":plugins ↳ :load_paths" ) }
|
|
158
|
+
config[:plugins][:load_paths] = RakefileComponentResolver.prepare_plugin_load_paths( config, plugins_load_path, expand: expand )
|
|
166
159
|
|
|
167
160
|
return @configurator_plugins.process_aux_load_paths( config )
|
|
168
161
|
end
|
|
@@ -233,6 +226,13 @@ class Configurator
|
|
|
233
226
|
end
|
|
234
227
|
|
|
235
228
|
|
|
229
|
+
# Each Unity helper's header is included in every mock by its filename, so this follows
|
|
230
|
+
# path standardizing, which a helper written with backslashes needs to have a filename
|
|
231
|
+
def populate_cmock_helpers(config)
|
|
232
|
+
include_unity_helpers( config[:cmock] ) if config[:project][:use_mocks]
|
|
233
|
+
end
|
|
234
|
+
|
|
235
|
+
|
|
236
236
|
def populate_test_runner_generation_config(config)
|
|
237
237
|
progress( 'Populating test runner generation settings' )
|
|
238
238
|
|
|
@@ -538,7 +538,8 @@ class Configurator
|
|
|
538
538
|
[DEFAULT_TOOLS_TEST_ASSEMBLER, setting( config, :test_build, :use_assembly )],
|
|
539
539
|
[DEFAULT_TOOLS_TEST_GDB_BACKTRACE, setting( config, :project, :use_backtrace ) == :gdb],
|
|
540
540
|
[DEFAULT_TOOLS_RELEASE, release],
|
|
541
|
-
[DEFAULT_TOOLS_RELEASE_ASSEMBLER, release && setting( config, :release_build, :use_assembly )]
|
|
541
|
+
[DEFAULT_TOOLS_RELEASE_ASSEMBLER, release && setting( config, :release_build, :use_assembly )],
|
|
542
|
+
[DEFAULT_TOOLS_WINDOWS_REGISTRY_QUERY, @system_wrapper.windows? && setting( config, :project, :win_path_limit ) != :classic]
|
|
542
543
|
].select { |_, needed| needed }.map( &:first )
|
|
543
544
|
end
|
|
544
545
|
|
|
@@ -573,8 +574,6 @@ class Configurator
|
|
|
573
574
|
# Plugins housekeeping
|
|
574
575
|
cmock[:plugins].map! { |plugin| plugin.to_sym() }.uniq!
|
|
575
576
|
|
|
576
|
-
include_unity_helpers( cmock )
|
|
577
|
-
|
|
578
577
|
# Add mocking prefix symbol for all test compilation
|
|
579
578
|
cmock[:defines] << "CMOCK_MOCK_PREFIX=#{cmock[:mock_prefix]}"
|
|
580
579
|
end
|
|
@@ -7,11 +7,15 @@
|
|
|
7
7
|
|
|
8
8
|
require 'rubygems'
|
|
9
9
|
require 'rake' # for ext() method
|
|
10
|
-
require 'ceedling/file_path_utils' # for class methods
|
|
10
|
+
require 'ceedling/filesystem/file_path_utils' # for class methods
|
|
11
|
+
require 'ceedling/filesystem/project_paths'
|
|
11
12
|
require 'ceedling/defaults'
|
|
12
13
|
require 'ceedling/constants' # for Verbosity constants class & base file paths
|
|
13
14
|
require 'ceedling/filename_extension'
|
|
14
15
|
require 'ceedling/rake_app/rakefile_component_resolver'
|
|
16
|
+
require 'ceedling/config/build_root_policy'
|
|
17
|
+
require 'ceedling/filesystem/build_roots'
|
|
18
|
+
require 'ceedling/exceptions'
|
|
15
19
|
|
|
16
20
|
class ConfiguratorBuilder
|
|
17
21
|
|
|
@@ -130,17 +134,18 @@ class ConfiguratorBuilder
|
|
|
130
134
|
|
|
131
135
|
|
|
132
136
|
# A release is named by :release_build ↳ :output, or by default and the executable
|
|
133
|
-
# extension. Its map file shares its name.
|
|
137
|
+
# extension. Its map file shares its name. A relative name is below the release build root,
|
|
138
|
+
# and an absolute one names the release itself.
|
|
134
139
|
def set_release_target(in_hash)
|
|
135
140
|
return {} if (not in_hash[:project_release_build])
|
|
136
141
|
|
|
137
|
-
output = in_hash[:release_build_output]
|
|
142
|
+
output = in_hash[:release_build_output]&.then { |name| ProjectPaths.standardize( name ) }
|
|
138
143
|
target = output || DEFAULT_RELEASE_TARGET_NAME.ext( in_hash[:extension_executable].primary )
|
|
139
144
|
map = (output || DEFAULT_RELEASE_TARGET_NAME).ext( in_hash[:extension_map].primary )
|
|
140
145
|
|
|
141
146
|
# tempted to make a helper method in file_path_utils? stop right there, pal. you'll introduce a cyclical dependency
|
|
142
147
|
root = in_hash[:project_build_release_root]
|
|
143
|
-
return { project_release_build_target:
|
|
148
|
+
return { project_release_build_target: release_place( root, target ), project_release_build_map: release_place( root, map ) }
|
|
144
149
|
end
|
|
145
150
|
|
|
146
151
|
|
|
@@ -163,14 +168,43 @@ class ConfiguratorBuilder
|
|
|
163
168
|
end
|
|
164
169
|
|
|
165
170
|
|
|
166
|
-
# Every :paths entry becomes a collection of the directories its globs name
|
|
171
|
+
# Every :paths entry becomes a collection of the directories its globs name, leaving out
|
|
172
|
+
# the build root, which a root above it (`../**`, `./**`) would otherwise sweep in, and
|
|
173
|
+
# the directories Ceedling creates
|
|
167
174
|
def expand_all_path_globs(in_hash)
|
|
168
175
|
path_keys = in_hash.keys.select { |key| key.to_s.start_with?( 'paths' ) }
|
|
169
176
|
|
|
170
|
-
return path_keys.to_h { |key| [:"collection_#{key}", @file_path_collection_utils.collect_paths( in_hash[key] )] }
|
|
177
|
+
return path_keys.to_h { |key| [:"collection_#{key}", @file_path_collection_utils.collect_paths( in_hash[key], **build_exclusions( in_hash ) )] }
|
|
171
178
|
end
|
|
172
179
|
|
|
173
180
|
|
|
181
|
+
# The roots build files mirror below, each spelled canonically: those of :paths ↳ :include,
|
|
182
|
+
# for a header's source by convention, and those every header is collected from
|
|
183
|
+
def collect_mirror_roots(in_hash)
|
|
184
|
+
include = Array( in_hash[:paths_include] )
|
|
185
|
+
headers = Array( in_hash[:paths_test] ) + Array( in_hash[:paths_support] ) + include
|
|
186
|
+
|
|
187
|
+
return {
|
|
188
|
+
:collection_mirror_roots_include => @file_path_collection_utils.collect_mirror_roots( include ),
|
|
189
|
+
:collection_mirror_roots_headers => @file_path_collection_utils.collect_mirror_roots( headers )
|
|
190
|
+
}
|
|
191
|
+
end
|
|
192
|
+
|
|
193
|
+
# The roots whose long locations build paths may spell by a short marker (see
|
|
194
|
+
# BuildRoots), taken from every :paths section a build's inputs come from
|
|
195
|
+
def collect_build_roots(in_hash)
|
|
196
|
+
entries = [:paths_source, :paths_include, :paths_test, :paths_support].flat_map { |key| Array( in_hash[key] ) }
|
|
197
|
+
roots = @file_path_collection_utils.collect_mirror_roots( entries )
|
|
198
|
+
|
|
199
|
+
collisions = BuildRoots.collisions( roots )
|
|
200
|
+
unless collisions.empty?
|
|
201
|
+
pairs = collisions.map { |a, b| "'#{a}' and '#{b}'" }.join( '; ' )
|
|
202
|
+
raise CeedlingException.new( "Configured paths #{pairs} would share one short name in build paths. Rename or move one of them." )
|
|
203
|
+
end
|
|
204
|
+
|
|
205
|
+
return { :collection_build_roots => roots }
|
|
206
|
+
end
|
|
207
|
+
|
|
174
208
|
def collect_source_and_include_paths(in_hash)
|
|
175
209
|
return {
|
|
176
210
|
:collection_paths_source_and_include =>
|
|
@@ -228,7 +262,7 @@ class ConfiguratorBuilder
|
|
|
228
262
|
end
|
|
229
263
|
|
|
230
264
|
# Add / subtract files via :files ↳ :test
|
|
231
|
-
tests = file_collection( patterns, in_hash[:files_test] )
|
|
265
|
+
tests = file_collection( in_hash, patterns, in_hash[:files_test] )
|
|
232
266
|
return { :collection_all_tests => tests }, tests
|
|
233
267
|
end
|
|
234
268
|
|
|
@@ -242,19 +276,16 @@ class ConfiguratorBuilder
|
|
|
242
276
|
paths = in_hash[:collection_paths_source] + in_hash[:collection_paths_support]
|
|
243
277
|
|
|
244
278
|
# Add / subtract files via :files ↳ :assembly
|
|
245
|
-
return { :collection_all_assembly => file_collection( code_patterns( paths, in_hash[:extension_assembly] ), in_hash[:files_assembly] ) }
|
|
279
|
+
return { :collection_all_assembly => file_collection( in_hash, code_patterns( paths, in_hash[:extension_assembly] ), in_hash[:files_assembly] ) }
|
|
246
280
|
end
|
|
247
281
|
|
|
248
282
|
|
|
249
|
-
# Source files, less any test files that overlapping test and source paths
|
|
283
|
+
# Source files, less any test files that overlapping test and source paths, or :files
|
|
284
|
+
# revisions, also matched
|
|
250
285
|
def collect_source(in_hash, test_list)
|
|
251
|
-
sources = file_list( code_patterns( in_hash[:collection_paths_source], in_hash[:extension_source] ) )
|
|
252
|
-
|
|
253
|
-
mixed_in = test_list.select { |test| sources.include?( test ) }
|
|
254
|
-
exclude_tests( sources, mixed_in ) unless mixed_in.empty?
|
|
255
|
-
|
|
256
286
|
# Add / subtract files via :files ↳ :source
|
|
257
|
-
|
|
287
|
+
sources = file_collection( in_hash, code_patterns( in_hash[:collection_paths_source], in_hash[:extension_source] ), in_hash[:files_source] )
|
|
288
|
+
return { :collection_all_source => without_tests( sources, test_list ) }
|
|
258
289
|
end
|
|
259
290
|
|
|
260
291
|
|
|
@@ -262,12 +293,12 @@ class ConfiguratorBuilder
|
|
|
262
293
|
paths = in_hash[:collection_paths_test] + in_hash[:collection_paths_support] + in_hash[:collection_paths_include]
|
|
263
294
|
|
|
264
295
|
# Add / subtract files via :files ↳ :include
|
|
265
|
-
return { :collection_all_headers => file_collection( code_patterns( paths, in_hash[:extension_header] ), in_hash[:files_include] ) }
|
|
296
|
+
return { :collection_all_headers => file_collection( in_hash, code_patterns( paths, in_hash[:extension_header] ), in_hash[:files_include] ) }
|
|
266
297
|
end
|
|
267
298
|
|
|
268
299
|
|
|
269
300
|
# Source files, plus CException's when exceptions are in use and assembly files when the
|
|
270
|
-
# release build assembles
|
|
301
|
+
# release build assembles, less any test file. Source collection already warned of those.
|
|
271
302
|
def collect_release_build_input(in_hash)
|
|
272
303
|
assembly = in_hash[:release_build_use_assembly]
|
|
273
304
|
vendor = in_hash[:project_use_exceptions] ? [in_hash[:project_build_vendor_cexception_path]] : []
|
|
@@ -275,7 +306,7 @@ class ConfiguratorBuilder
|
|
|
275
306
|
|
|
276
307
|
# Add / subtract files via :files ↳ :source & :files ↳ :assembly
|
|
277
308
|
revisions = in_hash[:files_source] + (assembly ? in_hash[:files_assembly] : [])
|
|
278
|
-
return { :collection_release_build_input => file_collection( patterns, revisions ) }
|
|
309
|
+
return { :collection_release_build_input => without_tests( file_collection( in_hash, patterns, revisions ), in_hash[:collection_all_tests], warn: false ) }
|
|
279
310
|
end
|
|
280
311
|
|
|
281
312
|
|
|
@@ -285,7 +316,7 @@ class ConfiguratorBuilder
|
|
|
285
316
|
paths = in_hash[:collection_paths_test] + in_hash[:collection_paths_support] + in_hash[:collection_paths_source]
|
|
286
317
|
patterns = vendor_patterns( test_vendor_paths( in_hash ) ) + code_patterns( paths, *code_extensions( in_hash, assembly ) )
|
|
287
318
|
|
|
288
|
-
return { :collection_existing_test_build_input => file_collection( patterns, test_build_revisions( in_hash, assembly ) ) }
|
|
319
|
+
return { :collection_existing_test_build_input => file_collection( in_hash, patterns, test_build_revisions( in_hash, assembly ) ) }
|
|
289
320
|
end
|
|
290
321
|
|
|
291
322
|
|
|
@@ -306,7 +337,7 @@ class ConfiguratorBuilder
|
|
|
306
337
|
patterns = code_patterns( in_hash[:collection_paths_support], *extensions )
|
|
307
338
|
|
|
308
339
|
# Add / subtract files via :files ↳ :support
|
|
309
|
-
sources = file_collection( patterns, in_hash[:files_support] ).to_a
|
|
340
|
+
sources = file_collection( in_hash, patterns, in_hash[:files_support] ).to_a
|
|
310
341
|
objects = sources.map { |file| File.basename( file ).ext( in_hash[:extension_object].primary ) }
|
|
311
342
|
|
|
312
343
|
return { :collection_all_support => sources, :collection_test_fixture_extra_link_objects => objects }
|
|
@@ -325,6 +356,11 @@ class ConfiguratorBuilder
|
|
|
325
356
|
|
|
326
357
|
private
|
|
327
358
|
|
|
359
|
+
# A relative release name is below the release build root, and an absolute one names itself
|
|
360
|
+
def release_place(root, name)
|
|
361
|
+
return ProjectPaths.absolute?( name ) ? name : File.join( root, name )
|
|
362
|
+
end
|
|
363
|
+
|
|
328
364
|
def flatten_section(section, value)
|
|
329
365
|
case value
|
|
330
366
|
when nil then {}
|
|
@@ -443,8 +479,18 @@ class ConfiguratorBuilder
|
|
|
443
479
|
end
|
|
444
480
|
|
|
445
481
|
# Files matching `patterns`, revised by a :files list of additions and removals
|
|
446
|
-
def file_collection(patterns, revisions)
|
|
447
|
-
return
|
|
482
|
+
def file_collection(in_hash, patterns, revisions)
|
|
483
|
+
return revised( in_hash, file_list( patterns ), revisions )
|
|
484
|
+
end
|
|
485
|
+
|
|
486
|
+
# A :files glob adds nothing from the build root it is based above, and no :files entry
|
|
487
|
+
# adds anything from the directories Ceedling creates
|
|
488
|
+
def revised(in_hash, list, revisions)
|
|
489
|
+
return @file_path_collection_utils.revise_filelist( list, revisions, **build_exclusions( in_hash ) )
|
|
490
|
+
end
|
|
491
|
+
|
|
492
|
+
def build_exclusions(in_hash)
|
|
493
|
+
return { exclude: [in_hash[:project_build_root]].compact, reserved: BuildRootPolicy.reserved( in_hash ) }
|
|
448
494
|
end
|
|
449
495
|
|
|
450
496
|
# FileList expands its patterns lazily, so they are expanded here
|
|
@@ -454,12 +500,13 @@ class ConfiguratorBuilder
|
|
|
454
500
|
return list.resolve()
|
|
455
501
|
end
|
|
456
502
|
|
|
457
|
-
|
|
458
|
-
|
|
459
|
-
|
|
460
|
-
|
|
461
|
-
|
|
462
|
-
)
|
|
503
|
+
# `files` less any of `tests`, compared as collected, warning of any
|
|
504
|
+
def without_tests(files, tests, warn: true)
|
|
505
|
+
mixed_in = files.to_a & tests.to_a
|
|
506
|
+
return files if mixed_in.empty?
|
|
507
|
+
|
|
508
|
+
@loginator.log( 'Test file paths and source file paths overlap -- test files have been filtered out of the source file collection', Verbosity::COMPLAIN ) if warn
|
|
509
|
+
return @file_wrapper.instantiate_file_list_literal( files.to_a - mixed_in ).resolve()
|
|
463
510
|
end
|
|
464
511
|
|
|
465
512
|
end
|