comparison tests/run-tests.py @ 12639:236058a65cb4

tests: replace test tmp directory with $TESTTMP in test output

This reduces the number of patterns that must be adjusted when writing tests.

12638:eb09e3c9c471

    pass

def alarmed(signum, frame):
    raise Timeout

def pytest(test, options):
    py3kswitch = options.py3k_warnings and ' -3' or ''
    cmd = '%s%s "%s"' % (PYTHON, py3kswitch, test)
    vlog("# Running", cmd)
    return run(cmd, options)

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

def battest(test, options):
    # To reliably get the error code from batch files on WinXP,
    # the "cmd /c call" prefix is needed. Grrr
    cmd = 'cmd /c call "%s"' % testpath
    vlog("# Running", cmd)
    return run(cmd, options)

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

            os.write(fd, l)
        os.close(fd)

        cmd = '/bin/sh "%s"' % name
        vlog("# Running", cmd)
        exitcode, output = run(cmd, options)
        # do not merge output if skipped, return hghave message instead
        if exitcode == SKIPPED_STATUS:
            return exitcode, output
    finally:
        os.remove(name)

    if pos in after:
        postout += after.pop(pos)

    return exitcode, postout

def run(cmd, options):
    """Run command in a sub-process, capturing the output (stdout and stderr).
    Return a tuple (exitcode, output).  output is None in debug mode."""
    # TODO: Use subprocess.Popen if we're running on Python 2.4
    if options.debug:
        proc = subprocess.Popen(cmd, shell=True)

        except KeyboardInterrupt:
            vlog('# Handling keyboard interrupt')
            cleanup()
            raise

    return ret, splitnewlines(output)

def runone(options, test, skips, fails):
    '''tristate output:
    None -> skipped

        elif not os.access(testpath, os.X_OK):
            return skip("not executable")
        runner = shtest

    # Make a tmp subdirectory to work in
    tmpd = os.path.join(HGTMP, test)
    os.mkdir(tmpd)
    os.chdir(tmpd)

    if options.timeout > 0:
        signal.alarm(options.timeout)

    ret, out = runner(testpath, options)
    vlog("# Ret was:", ret)

    if options.timeout > 0:
        signal.alarm(0)

    killdaemons()

    os.chdir(TESTDIR)
    if not options.keep_tmpdir:
        shutil.rmtree(tmpd, True)
    if skipped:
        return None
    return ret == 0

_hgpath = None

12639:236058a65cb4

    pass

def alarmed(signum, frame):
    raise Timeout

def pytest(test, options, replacements):
    py3kswitch = options.py3k_warnings and ' -3' or ''
    cmd = '%s%s "%s"' % (PYTHON, py3kswitch, test)
    vlog("# Running", cmd)
    return run(cmd, options, replacements)

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

def battest(test, options, replacements):
    # To reliably get the error code from batch files on WinXP,
    # the "cmd /c call" prefix is needed. Grrr
    cmd = 'cmd /c call "%s"' % testpath
    vlog("# Running", cmd)
    return run(cmd, options, replacements)

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

            os.write(fd, l)
        os.close(fd)

        cmd = '/bin/sh "%s"' % name
        vlog("# Running", cmd)
        exitcode, output = run(cmd, options, replacements)
        # do not merge output if skipped, return hghave message instead
        if exitcode == SKIPPED_STATUS:
            return exitcode, output
    finally:
        os.remove(name)

    if pos in after:
        postout += after.pop(pos)

    return exitcode, postout

def run(cmd, options, replacements):
    """Run command in a sub-process, capturing the output (stdout and stderr).
    Return a tuple (exitcode, output).  output is None in debug mode."""
    # TODO: Use subprocess.Popen if we're running on Python 2.4
    if options.debug:
        proc = subprocess.Popen(cmd, shell=True)

        except KeyboardInterrupt:
            vlog('# Handling keyboard interrupt')
            cleanup()
            raise

    for s, r in replacements:
        output = output.replace(s, r)
    return ret, splitnewlines(output)

def runone(options, test, skips, fails):
    '''tristate output:
    None -> skipped

        elif not os.access(testpath, os.X_OK):
            return skip("not executable")
        runner = shtest

    # Make a tmp subdirectory to work in
    testtmp = os.environ["TESTTMP"] = os.path.join(HGTMP, test)
    os.mkdir(testtmp)
    os.chdir(testtmp)

    if options.timeout > 0:
        signal.alarm(options.timeout)

    ret, out = runner(testpath, options, [(testtmp, '$TESTTMP')])
    vlog("# Ret was:", ret)

    if options.timeout > 0:
        signal.alarm(0)

    killdaemons()

    os.chdir(TESTDIR)
    if not options.keep_tmpdir:
        shutil.rmtree(testtmp, True)
    if skipped:
        return None
    return ret == 0

_hgpath = None