Merge branch 'release/2.2.5'

szaghi · Jun 26, 2017 · adf91f0 · adf91f0
2 parents d275735 + 333c509
commit adf91f0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/src/main/python/fobis/FoBiSConfig.py b/src/main/python/fobis/FoBiSConfig.py
@@ -28,7 +28,7 @@
 from .utils import syswork
 
 __appname__ = "FoBiS.py"
-__version__ = "2.2.4"
+__version__ = "2.2.5"
 __author__ = "Stefano Zaghi"
 __author_email__ = "stefano.zaghi@gmail.com"
 __license__ = "GNU General Public License v3 (GPLv3)"

diff --git a/src/main/python/fobis/cli_parser.py b/src/main/python/fobis/cli_parser.py
@@ -116,6 +116,7 @@ def _subparser_files(doctests=False):
   parser_group.add_argument('-build_all', required=False, action='store_true', default=False, help='Build all sources parsed [default False]')
   if doctests:
     parser_group.add_argument('-keep_volatile_doctests', required=False, action='store_true', default=False, help='Keep the volatile doctests programs [default False]')
+    parser_group.add_argument('--exclude_from_doctests', required=False, action='store', nargs='+', default=[], help='Exclude a list of files from the doctests process', metavar='FILE#...')
   return parser
 
 

diff --git a/src/main/python/fobis/fobis.py b/src/main/python/fobis/fobis.py
@@ -383,7 +383,7 @@ def test_doctests(configuration, doctests, pfiles, nomodlibs, builder):
   builder : Builder()
   """
   for test in doctests:
-    if test.is_doctest:
+    if test.is_doctest and os.path.basename(test.name).split("-doctest")[0] not in [os.path.basename(os.path.splitext(exc)[0]) for exc in configuration.cliargs.exclude_from_doctests]:
       remove_other_main(builder=builder, pfiles=pfiles, mysefl=test)
       builder.build(file_to_build=test, nomodlibs=nomodlibs, verbose=False, log=False, quiet=True)
       test_exe = os.path.join(builder.build_dir, os.path.splitext(os.path.basename(test.name))[0])