comparison tests/run-tests.py @ 12941:b911cb80c671 stable

tests: use (esc) markup for string-escape

This makes test output less ambiguous.

Failing test output will be escaped and marked up if necessary. A Python
string-escape compatible encoding is used, but not everything is encoded -
especially not \n and \t and '.

12940:518dd70d1a6e

def shtest(test, options, replacements):
    cmd = '"%s"' % test
    vlog("# Running", cmd)
    return run(cmd, options, replacements)

def tsttest(test, options, replacements):
    t = open(test)
    out = []
    script = []
    salt = "SALT" + str(time.time())

            if pos in expected and expected[pos]:
                el = expected[pos].pop(0)

            if el == lout: # perfect match (fast)
                postout.append("  " + lout)
            elif el and el.decode('string-escape') == l:
                postout.append("  " + el)  # \-escape match
            elif (el and
                  (el.endswith(" (re)\n") and rematch(el[:-6] + '\n', lout) or
                   el.endswith(" (glob)\n") and globmatch(el[:-8] + '\n', lout))):
                postout.append("  " + el) # fallback regex/glob match
            else:
                postout.append("  " + lout) # let diff deal with it

        if lcmd:
            # add on last return code
            ret = int(lcmd.split()[1])

12941:b911cb80c671

def shtest(test, options, replacements):
    cmd = '"%s"' % test
    vlog("# Running", cmd)
    return run(cmd, options, replacements)

needescape = re.compile(r'[\x00-\x08\x0b-\x1f\x7f-\xff]').search
escapesub = re.compile(r'[\x00-\x08\x0b-\x1f\\\x7f-\xff]').sub
escapemap = dict((chr(i), r'\x%02x' % i) for i in range(256))
escapemap.update({'\\': '\\\\', '\r': r'\r'})
def escapef(m):
    return escapemap[m.group(0)]
def stringescape(s):
    return escapesub(escapef, s)

def tsttest(test, options, replacements):
    t = open(test)
    out = []
    script = []
    salt = "SALT" + str(time.time())

            if pos in expected and expected[pos]:
                el = expected[pos].pop(0)

            if el == lout: # perfect match (fast)
                postout.append("  " + lout)
            elif (el and
                  (el.endswith(" (re)\n") and rematch(el[:-6] + '\n', lout) or
                   el.endswith(" (glob)\n") and globmatch(el[:-8] + '\n', lout)) or
                   el.endswith(" (esc)\n") and el.decode('string-escape') == l):
                postout.append("  " + el) # fallback regex/glob/esc match
            else:
                if needescape(lout):
                    lout = stringescape(lout.rstrip('\n')) + " (esc)\n"
                postout.append("  " + lout) # let diff deal with it

        if lcmd:
            # add on last return code
            ret = int(lcmd.split()[1])