Merge branch 'master' into bugfix/conversion_tool_perflogdir

Author: Vasileios Karakasis

docs/config_reference.rst

@@ -1023,7 +1023,7 @@ General Configuration
 .. option:: -R | --recursive
 
    :required: No
-   :default: ``true``
+   :default: ``false``
 
    Search directories in the `search path <#.general[].check_search_path>`__ recursively.
 

docs/migration_2_to_3.rst

@@ -24,18 +24,24 @@ As soon as it detects an old-style configuration file, it will convert it to the
    ./bin/reframe: the syntax of the configuration file 'unittests/resources/settings_old_syntax.py' is deprecated
    ./bin/reframe: configuration file has been converted to the new syntax here: '/var/folders/h7/k7cgrdl13r996m4dmsvjq7v80000gp/T/tmph5n8u3kf.py'
 
-Alternatively, you can convert any old configuration file using the conversion tool ``tools/convert_config.py``:
+Alternatively, you can convert any old configuration file using the conversion tool |convert_config|_:
+
+.. |convert_config| replace:: :obj:`convert-config`
+.. _convert_config: https://github.com/eth-cscs/reframe/blob/master/tools/convert-config
 
 .. code-block:: none
 
-   $ ./tools/convert-config unittests/resources/settings_old_syntax.py
-   Conversion successful! The converted file can be found at '/var/folders/h7/k7cgrdl13r996m4dmsvjq7v80000gp/T/tmpz4f6yer4.py'.
+   $ ./tools/convert-config unittests/resources/settings_old_syntax.py new_config.py
+   Conversion successful! The converted file can be found at 'new_config.py'.
 
 
 Another important change is that default locations for looking up a configuration file has changed (see `Configuring ReFrame for Your Site <configure.html>`__ for more details).
 That practically means that if you were relying on ReFrame loading your ``reframe/settings.py`` by default, this is no longer true.
 You have to move it to any of the default settings locations or set the corresponding command line option or environment variable.
 
+.. note::
+   The conversion tool will create a JSON configuration file if the extension of the target file is ``.json``.
+
 
 Automatic conversion limitations
 ================================

reframe/core/config.py

@@ -532,9 +532,16 @@ def handler_list(handler_config, basedir=None):
                 f"by ReFrame based on '{filename}'.\n#\n\n"
                 f"site_configuration = {util.ppretty(converted)}\n")
 
+    contents = '\n'.join(l if len(l) < 80 else f'{l}  # noqa: E501'
+                         for l in contents.split('\n'))
+
     if newfilename:
         with open(newfilename, 'w') as fp:
-            fp.write(contents)
+            if newfilename.endswith('.json'):
+                json.dump(converted, fp, indent=4)
+            else:
+                fp.write(contents)
+
     else:
         with tempfile.NamedTemporaryFile(mode='w', suffix='.py',
                                          delete=False) as fp:

reframe/frontend/cli.py

@@ -332,8 +332,7 @@ def main():
     logging.getlogger().colorize = site_config.get('general/0/colorize')
     printer = PrettyPrinter()
     printer.colorize = site_config.get('general/0/colorize')
-    if options.verbose:
-        printer.inc_verbosity(options.verbose)
+    printer.inc_verbosity(site_config.get('general/0/verbose'))
 
     # Now configure ReFrame according to the user configuration file
     try:
@@ -360,6 +359,7 @@ def main():
 
     logging.getlogger().colorize = site_config.get('general/0/colorize')
     printer.colorize = site_config.get('general/0/colorize')
+    printer.inc_verbosity(site_config.get('general/0/verbose'))
     try:
         runtime.init_runtime(site_config)
     except ConfigError as e:

schemas/config.json

@@ -386,7 +386,7 @@
         "environments/ldflags": [],
         "environments/target_systems": ["*"],
         "general/check_search_path": ["${RFM_INSTALL_PREFIX}/checks/"],
-        "general/check_search_recursive": true,
+        "general/check_search_recursive": false,
         "general/colorize": true,
         "general/ignore_check_conflicts": false,
         "general/keep_stage_files": false,

tools/convert_config.py

@@ -20,6 +20,9 @@
         print(f'{sys.argv[0]}: too few arguments', file=sys.stderr)
         print(f'Usage: {sys.argv[0]} OLD_CONFIG_FILE [NEW_CONFIG_FILE]',
               file=sys.stderr)
+        print('       Use the extension of NEW_CONFIG_FILE to specify\n'
+              '       python (.py) or json (.json) format.',
+              file=sys.stderr)
         sys.exit(1)
 
     try:

tutorial/config/settings.py

@@ -131,7 +131,6 @@
     'general': [
         {
             'check_search_path': ['tutorial/'],
-            'check_search_recursive': True
         }
     ]
 }

unittests/test_argparser.py

@@ -156,7 +156,7 @@ def test_option_with_config(extended_parser):
             ['--timestamp=%FT%T', '--nocolor']
         )
         options.update_config(site_config)
-        assert site_config.get('general/0/check_search_recursive') is True
+        assert site_config.get('general/0/check_search_recursive') is False
         assert site_config.get('general/0/timestamp_dirs') == '%FT%T'
         assert site_config.get('general/0/non_default_craype') is True
         assert site_config.get('systems/0/prefix') == '.'