comparison tests/run-tests.py @ 15449:f71d60da58fb

tests: ignore \r on windows

15448:873f94ecd706

        return True
    if (el and
        (el.endswith(" (re)\n") and rematch(el[:-6] + '\n', l) or
         el.endswith(" (glob)\n") and globmatch(el[:-8] + '\n', l) or
         el.endswith(" (esc)\n") and
             el[:-7].decode('string-escape') + '\n' == l)):
        return True
    return False

def tsttest(test, wd, options, replacements):
    # We generate a shell script which outputs unique markers to line

    # Make a tmp subdirectory to work in
    testtmp = os.environ["TESTTMP"] = os.environ["HOME"] = \
        os.path.join(HGTMP, os.path.basename(test)).replace('\\', '/')

    os.mkdir(testtmp)
    ret, out = runner(testpath, testtmp, options, [
        (re.escape(testtmp), '$TESTTMP'),
        (r':%s\b' % options.port, ':$HGPORT'),
        (r':%s\b' % (options.port + 1), ':$HGPORT1'),
        (r':%s\b' % (options.port + 2), ':$HGPORT2'),
        ])
    vlog("# Ret was:", ret)

    mark = '.'

    skipped = (ret == SKIPPED_STATUS)

15449:f71d60da58fb

        return True
    if (el and
        (el.endswith(" (re)\n") and rematch(el[:-6] + '\n', l) or
         el.endswith(" (glob)\n") and globmatch(el[:-8] + '\n', l) or
         el.endswith(" (esc)\n") and
             (el[:-7].decode('string-escape') + '\n' == l or
              el[:-7].decode('string-escape').replace('\r', '') +
                  '\n' == l and os.name == 'nt'))):
        return True
    return False

def tsttest(test, wd, options, replacements):
    # We generate a shell script which outputs unique markers to line

    # Make a tmp subdirectory to work in
    testtmp = os.environ["TESTTMP"] = os.environ["HOME"] = \
        os.path.join(HGTMP, os.path.basename(test)).replace('\\', '/')

    replacements = [
        (re.escape(testtmp), '$TESTTMP'),
        (r':%s\b' % options.port, ':$HGPORT'),
        (r':%s\b' % (options.port + 1), ':$HGPORT1'),
        (r':%s\b' % (options.port + 2), ':$HGPORT2'),
        ]
    if os.name == 'nt':
        replacements.append((r'\r\n', '\n'))

    os.mkdir(testtmp)
    ret, out = runner(testpath, testtmp, options, replacements)
    vlog("# Ret was:", ret)

    mark = '.'

    skipped = (ret == SKIPPED_STATUS)