summaryrefslogtreecommitdiff
path: root/pygnulib/GLTestDir.py
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2017-09-09 12:48:58 +0200
committerBruno Haible <bruno@clisp.org>2017-09-09 16:43:24 +0200
commit0f23f389f4102a183c0cf7a3599f0f1318e7aaed (patch)
tree43db692635e5435c35dcc02c759442a0e9f2bf97 /pygnulib/GLTestDir.py
parentd568af9587276169ae1f4f3ce253cbc25cb8fc9a (diff)
downloadgnulib-0f23f389f4102a183c0cf7a3599f0f1318e7aaed.tar.gz
gnulib-tool.py: Define and use two new global functions.
* pygnulib/constants.py (remove_backslash_newline, combine_lines): New functions.
Diffstat (limited to 'pygnulib/GLTestDir.py')
-rw-r--r--pygnulib/GLTestDir.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pygnulib/GLTestDir.py b/pygnulib/GLTestDir.py
index 61407502ab..fded6d7656 100644
--- a/pygnulib/GLTestDir.py
+++ b/pygnulib/GLTestDir.py
@@ -727,6 +727,7 @@ class GLTestDir(object):
path = joinpath(self.testdir, sourcebase, 'Makefile.am')
with codecs.open(path, 'rb', 'UTF-8') as file:
snippet = file.read()
+ snippet = constants.remove_backslash_newline(snippet)
cleaned_files = list()
tests_cleaned_files = list()
built_sources = list()
@@ -736,7 +737,6 @@ class GLTestDir(object):
# Extract the value of "CLEANFILES += ..." and "MOSTLYCLEANFILES += ...".
regex_find = list()
- snippet = snippet.replace('\\\n', '')
pattern = compiler('^CLEANFILES[\t ]*\\+=(.*?)$', re.S | re.M)
regex_find += pattern.findall(snippet)
pattern = compiler('^MOSTLYCLEANFILES[\t ]*\\+=(.*?)$', re.S | re.M)
@@ -765,10 +765,10 @@ class GLTestDir(object):
path = joinpath(self.testdir, testsbase, 'Makefile.am')
with codecs.open(path, 'rb', 'UTF-8') as file:
snippet = file.read()
+ snippet = constants.remove_backslash_newline(snippet)
# Extract the value of "CLEANFILES += ..." and "MOSTLYCLEANFILES += ...".
regex_find = list()
- snippet = snippet.replace('\\\n', '')
pattern = compiler('^CLEANFILES[\t ]*\\+=(.*?)$', re.S | re.M)
regex_find += pattern.findall(snippet)
pattern = compiler(