diff options
| author | Bruno Haible <bruno@clisp.org> | 2022-08-04 11:53:37 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2022-08-04 12:34:05 +0200 |
| commit | e7101c252c537dd198af9329d861c353241bcb61 (patch) | |
| tree | 9ebad6573b4bc6bbb2cdddf86a4bbdeaebbc3aeb /pygnulib | |
| parent | f04b5c3acdc08549fb5b25936d2d17faae83a89b (diff) | |
| download | gnulib-e7101c252c537dd198af9329d861c353241bcb61.tar.gz | |
gnulib-tool.py: Make --with/--without-*-tests handling a little safer.
* pygnulib/GLConfig.py (__init__): Fix reset* invocations.
setInclTestCategories, setExclTestCategories): Revert to old value if
the new value is invalid.
Diffstat (limited to 'pygnulib')
| -rw-r--r-- | pygnulib/GLConfig.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pygnulib/GLConfig.py b/pygnulib/GLConfig.py index 37b30753ea..30ca391b0d 100644 --- a/pygnulib/GLConfig.py +++ b/pygnulib/GLConfig.py @@ -119,11 +119,11 @@ class GLConfig(object): if files != None: self.setFiles(files) # test categories to include - self.resetInclTestCategories + self.resetInclTestCategories() if incl_test_categories != None: self.setInclTestCategories(incl_test_categories) # test categories to exclude - self.resetExclTestCategories + self.resetExclTestCategories() if excl_test_categories != None: self.setExclTestCategories(excl_test_categories) # libname @@ -725,11 +725,13 @@ class GLConfig(object): def setInclTestCategories(self, categories): '''Specify the test categories that should be included.''' if type(categories) is list or type(categories) is tuple: + old_categories = self.table['incl_test_categories'] self.table['incl_test_categories'] = list() for category in categories: try: # Try to enable each category self.enableInclTestCategory(category) except TypeError as error: + self.table['incl_test_categories'] = old_categories raise TypeError('each category must be one of TESTS integers') else: # if type of categories is not list or tuple raise TypeError('categories must be a list or a tuple, not %s' % @@ -771,11 +773,13 @@ class GLConfig(object): def setExclTestCategories(self, categories): '''Specify the test categories that should be excluded.''' if type(categories) is list or type(categories) is tuple: + old_categories = self.table['excl_test_categories'] self.table['excl_test_categories'] = list() for category in categories: try: # Try to enable each category self.enableExclTestCategory(category) except TypeError as error: + self.table['excl_test_categories'] = old_categories raise TypeError('each category must be one of TESTS integers') else: # if type of categories is not list or tuple raise TypeError('categories must be a list or a tuple, not %s' % |