Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix build options that should have empty list as default value #4108

Merged
merged 4 commits into from
Nov 23, 2022
Merged

fix build options that should have empty list as default value #4108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c5f1075
fix build options that should have empty list as default value
boegel Oct 22, 2022
2dcb363
alphabetical order
branfosj Nov 23, 2022
9ff7069
Merge pull request #54 from branfosj/build_option_empty_list
boegel Nov 23, 2022
1996a50
Merge branch 'develop' into build_option_empty_list
branfosj Nov 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 28 additions & 20 deletions easybuild/tools/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@
UNSET = 'unset'
WARN = 'warn'

EMPTY_LIST = 'empty_list'

PKG_TOOL_FPM = 'fpm'
PKG_TYPE_RPM = 'rpm'

Expand Down Expand Up @@ -183,9 +185,9 @@ def mk_full_default_path(name, prefix=DEFAULT_PREFIX):
# build options that have a perfectly matching command line option, listed by default value
BUILD_OPTIONS_CMDLINE = {
None: [
'accept_eula_for',
'aggregate_regtest',
'backup_modules',
'banned_linked_shared_libs',
'checksum_priority',
'container_config',
'container_image_format',
Expand All @@ -203,19 +205,17 @@ def mk_full_default_path(name, prefix=DEFAULT_PREFIX):
'filter_deps',
'filter_ecs',
'filter_env_vars',
'hide_deps',
'hide_toolchains',
'http_header_fields_urlpat',
'force_download',
'insecure_download',
'from_pr',
'git_working_dirs_path',
'github_user',
'github_org',
'group',
'hide_deps',
'hide_toolchains',
'http_header_fields_urlpat',
'hooks',
'ignore_dirs',
'include_easyblocks_from_pr',
'insecure_download',
'job_backend_config',
'job_cores',
'job_deps_type',
Expand All @@ -240,7 +240,6 @@ def mk_full_default_path(name, prefix=DEFAULT_PREFIX):
'regtest_output_dir',
'rpath_filter',
'rpath_override_dirs',
'banned_linked_shared_libs',
'required_linked_shared_libs',
'silence_deprecation_warnings',
'skip',
Expand All @@ -249,8 +248,8 @@ def mk_full_default_path(name, prefix=DEFAULT_PREFIX):
'sysroot',
'test_report_env_filter',
'testoutput',
'wait_on_lock',
'umask',
'wait_on_lock',
'zip_logs',
],
False: [
Expand All @@ -264,9 +263,10 @@ def mk_full_default_path(name, prefix=DEFAULT_PREFIX):
'debug_lmod',
'dump_autopep8',
'enforce_checksums',
'extended_dry_run',
'experimental',
'extended_dry_run',
'force',
'generate_devel_module',
'group_writable_installdir',
'hidden',
'ignore_checksums',
Expand All @@ -281,27 +281,24 @@ def mk_full_default_path(name, prefix=DEFAULT_PREFIX):
'package',
'parallel_extensions_install',
'read_only_installdir',
'remove_ghost_install_dirs',
'rebuild',
'robot',
'remove_ghost_install_dirs',
'rpath',
'sanity_check_only',
'search_paths',
'sequential',
'set_default_module',
'set_gid_bit',
'skip_extensions',
'skip_test_cases',
'skip_test_step',
'generate_devel_module',
'sticky_bit',
'trace',
'unit_testing_mode',
'upload_test_report',
'update_modules_tool_cache',
'use_ccache',
'use_f90cache',
'use_existing_modules',
'set_default_module',
'use_f90cache',
'wait_on_lock_limit',
],
True: [
Expand All @@ -313,16 +310,23 @@ def mk_full_default_path(name, prefix=DEFAULT_PREFIX):
'lib_lib64_symlink',
'lib64_fallback_sanity_check',
'lib64_lib_symlink',
'mpi_tests',
'map_toolchains',
'modules_tool_version_check',
'mpi_tests',
'pre_create_installdir',
'show_progress_bar',
],
EMPTY_LIST: [
'accept_eula_for',
'from_pr',
'include_easyblocks_from_pr',
'robot',
'search_paths',
],
WARN: [
'check_ebroot_env_vars',
'local_var_naming_check',
'detect_loaded_modules',
'local_var_naming_check',
'strict',
],
DEFAULT_CONT_TYPE: [
Expand Down Expand Up @@ -387,8 +391,8 @@ def mk_full_default_path(name, prefix=DEFAULT_PREFIX):
],
False: [
'dry_run',
'recursive_mod_unload',
'mod_depends_on',
'recursive_mod_unload',
'retain_all_deps',
'silent',
'try_to_generate',
Expand Down Expand Up @@ -570,7 +574,11 @@ def init_build_options(build_options=None, cmdline_options=None):
bo = {}
for build_options_by_default in [BUILD_OPTIONS_CMDLINE, BUILD_OPTIONS_OTHER]:
for default in build_options_by_default:
bo.update(dict([(opt, default) for opt in build_options_by_default[default]]))
if default == EMPTY_LIST:
for opt in build_options_by_default[default]:
bo[opt] = []
else:
bo.update(dict([(opt, default) for opt in build_options_by_default[default]]))
bo.update(active_build_options)

# BuildOptions is a singleton, so any future calls to BuildOptions will yield the same instance
Expand Down
4 changes: 4 additions & 0 deletions test/framework/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,10 @@ def test_build_options(self):
self.assertEqual(bo['robot_path'], '/some/robot/path')
self.assertEqual(bo['stop'], 'configure')

# also check some default values that should be an empty list
for opt in ('accept_eula_for', 'from_pr', 'include_easyblocks_from_pr', 'robot'):
self.assertEqual(bo[opt], [], "Default value of build option '%s' should be []" % opt)

# all possible build options should be set (defaults are used where needed)
self.assertEqual(sorted(bo.keys()), sorted(BuildOptions.KNOWN_KEYS))

Expand Down