diff --git a/tests/run-tests.py b/tests/run-tests.py --- a/tests/run-tests.py +++ b/tests/run-tests.py @@ -949,13 +949,18 @@ class PythonTest(Test): return result -# This script may want to drop globs from lines matching these patterns on -# Windows, but check-code.py wants a glob on these lines unconditionally. Don't -# warn if that is the case for anything matching these lines. +# Some glob patterns apply only in some circumstances, so the script +# might want to remove (glob) annotations that otherwise should be +# retained. checkcodeglobpats = [ + # On Windows it looks like \ doesn't require a (glob), but we know + # better. re.compile(br'^pushing to \$TESTTMP/.*[^)]$'), re.compile(br'^moving \S+/.*[^)]$'), - re.compile(br'^pulling from \$TESTTMP/.*[^)]$') + re.compile(br'^pulling from \$TESTTMP/.*[^)]$'), + # Not all platforms have 127.0.0.1 as loopback (though most do), + # so we always glob that too. + re.compile(br'.*127.0.0.1.*$'), ] bchr = chr @@ -1263,6 +1268,7 @@ class TTest(Test): return True return b'-glob' return True + el = el.replace(b'127.0.0.1', b'*') i, n = 0, len(el) res = b'' while i < n: diff --git a/tests/test-run-tests.t b/tests/test-run-tests.t --- a/tests/test-run-tests.t +++ b/tests/test-run-tests.t @@ -735,6 +735,10 @@ backslash on end of line with glob match $ rm -f test-glob-backslash.t +Test globbing of 127.0.0.1 + $ echo 172.16.18.1 + 127.0.0.1 (glob) + Test reusability for third party tools ======================================