>From a7bcb91088e7fa6a533528aec076fc536789b96f Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 8 Aug 2022 00:46:13 +0200 Subject: [PATCH 19/19] gnulib-tool.py: Finish implementing option --extract-test-module. * gnulib-tool.py (main): Accept option --extract-tests-module. --- ChangeLog | 3 +++ gnulib-tool.py | 8 ++++++++ gnulib-tool.py.TODO | 1 - 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f3a37cea1c..63691ebfb6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2022-08-07 Bruno Haible + gnulib-tool.py: Finish implementing option --extract-test-module. + * gnulib-tool.py (main): Accept option --extract-tests-module. + gnulib-tool.py: Fix handling of nonexistent module names in --extract-*. * gnulib-tool.py (main): To test whether a module exists, just call GLModuleSystem.find and test its return value. diff --git a/gnulib-tool.py b/gnulib-tool.py index 0abe8c5ca7..9988c84de9 100755 --- a/gnulib-tool.py +++ b/gnulib-tool.py @@ -180,6 +180,10 @@ def main(): dest='mode_xmaintainer', default=None, action='store_true') + parser.add_argument('--extract-tests-module', + dest='mode_xtests', + default=None, + action='store_true') # copy-file parser.add_argument('--copy-file', dest='mode_copy_file', @@ -446,6 +450,7 @@ def main(): cmdargs.mode_xlink, cmdargs.mode_xlicense, cmdargs.mode_xmaintainer, + cmdargs.mode_xtests, cmdargs.mode_copy_file, ] overflow = [ arg @@ -535,6 +540,9 @@ def main(): if cmdargs.mode_xmaintainer != None: mode = 'extract-maintainer' modules = list(cmdargs.non_option_arguments) + if cmdargs.mode_xtests != None: + mode = 'extract-tests-module' + modules = list(cmdargs.non_option_arguments) if cmdargs.mode_copy_file != None: mode = 'copy-file' if len(cmdargs.non_option_arguments) < 1 or len(cmdargs.non_option_arguments) > 2: diff --git a/gnulib-tool.py.TODO b/gnulib-tool.py.TODO index 9efcda510d..be6a2e2b10 100644 --- a/gnulib-tool.py.TODO +++ b/gnulib-tool.py.TODO @@ -22,7 +22,6 @@ Inline all 'sed' invocations. Implement the options: --extract-recursive-dependencies --extract-recursive-link-directive - --extract-tests-module --conditional-dependencies --no-conditional-dependencies --gnu-make -- 2.34.1