changeset 29518:348b2b9da703

run-tests: add support for using 127.0.0.1 as a glob Some systems don't have a 127/8 address for localhost (I noticed this on a FreeBSD jail). In order to work around this, use 127.0.0.1 as a glob pattern. A future commit will update needed output lines and add a requirement to check-code.py.
author Augie Fackler <raf@durin42.com>
date Sat, 09 Jul 2016 23:01:02 -0400
parents f1fdd7e7d434
children fe7158fced4b
files tests/run-tests.py tests/test-run-tests.t
diffstat 2 files changed, 14 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/tests/run-tests.py	Tue Jul 12 15:34:17 2016 -0400
+++ b/tests/run-tests.py	Sat Jul 09 23:01:02 2016 -0400
@@ -949,13 +949,18 @@
 
         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 @@
                         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:
--- a/tests/test-run-tests.t	Tue Jul 12 15:34:17 2016 -0400
+++ b/tests/test-run-tests.t	Sat Jul 09 23:01:02 2016 -0400
@@ -735,6 +735,10 @@
 
   $ 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
 ======================================