comparison tests/run-tests.py @ 35449:24528dba0e64

run-tests: add substitution patterns for common '\' path output on Windows The goal is to reduce the amount of hand tuning of new/changed tests that is required on Windows. Since the OS prints the proper paths everywhere else, this is limited to Windows. These are based on the check-code rules that were dropped in 5feb782c7a95. There are some minor tweaks, because those were trying to detect '/' paths without a '(glob)' at the end, whereas these detect '\' paths. Also, it looks like the 'no changes made to subrepo' one was broke, because the path to the subrepo has been getting output but was not in the pattern. End anchors are dropped because '(glob)' is no longer required, but '(feature !)' annotations are a possibility. The 'saved backup bundle' pattern dropped from run-tests.py was simply carrying over the first capture group. The replace() method runs prior to evaluating '\1', but it wasn't doing anything because of the 'r' prefix on '\\'. The 'not recording move' entry is new, because I stumbled upon it searching for some of these patterns. There are probably others.
author Matt Harbison <matt_harbison@yahoo.com>
date Tue, 12 Dec 2017 20:11:13 -0500
parents 0432e54f4dbe
children e31773898197
comparison
equal deleted inserted replaced
35448:8251c4c4abdc 35449:24528dba0e64
970 r = [ 970 r = [
971 # This list should be parallel to defineport in _getenv 971 # This list should be parallel to defineport in _getenv
972 self._portmap(0), 972 self._portmap(0),
973 self._portmap(1), 973 self._portmap(1),
974 self._portmap(2), 974 self._portmap(2),
975 (br'(?m)^(saved backup bundle to .*\.hg)( \(glob\))?$',
976 br'\1'.replace(br'\\', br'/')),
977 (br'([^0-9])%s' % re.escape(self._localip()), br'\1$LOCALIP'), 975 (br'([^0-9])%s' % re.escape(self._localip()), br'\1$LOCALIP'),
978 (br'\bHG_TXNID=TXN:[a-f0-9]{40}\b', br'HG_TXNID=TXN:$ID$'), 976 (br'\bHG_TXNID=TXN:[a-f0-9]{40}\b', br'HG_TXNID=TXN:$ID$'),
979 ] 977 ]
980 r.append((self._escapepath(self._testtmp), b'$TESTTMP')) 978 r.append((self._escapepath(self._testtmp), b'$TESTTMP'))
981 979