comparison tests/run-tests.py @ 21343:93511a595766

run-tests: move INST out of a global

21342:1ad7aabba14e

           ' build %(compiler)s --build-base="%(base)s"'
           ' install --force --prefix="%(prefix)s" --install-lib="%(libdir)s"'
           ' --install-scripts="%(bindir)s" %(nohome)s >%(logfile)s 2>&1'
           % {'exe': sys.executable, 'py3': py3, 'pure': pure,
              'compiler': compiler, 'base': os.path.join(runner.hgtmp, "build"),
              'prefix': INST, 'libdir': PYTHONDIR, 'bindir': BINDIR,
              'nohome': nohome, 'logfile': installerrs})
    vlog("# Running", cmd)
    if os.system(cmd) == 0:
        if not options.verbose:
            os.remove(installerrs)

        vlog('# Installing coverage trigger to %s' % target)
        shutil.copyfile(custom, target)
        rc = os.path.join(runner.testdir, '.coveragerc')
        vlog('# Installing coverage rc to %s' % rc)
        os.environ['COVERAGE_PROCESS_START'] = rc
        fn = os.path.join(INST, '..', '.coverage')
        os.environ['COVERAGE_FILE'] = fn

def outputtimes(options):
    vlog('# Producing time report')
    times.sort(key=lambda t: (t[1], t[0]), reverse=True)

    except KeyboardInterrupt:
        abort = True

def runtests(runner, options, tests):
    try:
        if INST:
            installhg(runner, options)
            _checkhglib("Testing")
        else:
            usecorrectpython()

    Tests rely on a lot of state. This object holds it for them.
    """
    def __init__(self):
        self.testdir = None
        self.hgtmp = None

def main(args, parser=None):
    runner = TestRunner()

    parser = parser or getparser()

    if 'PYTHONHASHSEED' not in os.environ:
        # use a random python hash seed all the time
        # we do the randomness ourself to know what seed is used
        os.environ['PYTHONHASHSEED'] = str(random.getrandbits(32))

    global INST, BINDIR, TMPBINDIR, PYTHONDIR, COVERAGE_FILE
    runner.testdir = os.environ['TESTDIR'] = os.getcwd()
    if options.tmpdir:
        options.keep_tmpdir = True
        tmpdir = options.tmpdir
        if os.path.exists(tmpdir):

            d = os.getenv('TMP')
        tmpdir = tempfile.mkdtemp('', 'hgtests.', d)
    runner.hgtmp = os.environ['HGTMP'] = os.path.realpath(tmpdir)

    if options.with_hg:
        INST = None
        BINDIR = os.path.dirname(os.path.realpath(options.with_hg))
        TMPBINDIR = os.path.join(runner.hgtmp, 'install', 'bin')
        os.makedirs(TMPBINDIR)

        # This looks redundant with how Python initializes sys.path from

        # "hg" specified by --with-hg is not the only Python script
        # executed in the test suite that needs to import 'mercurial'
        # ... which means it's not really redundant at all.
        PYTHONDIR = BINDIR
    else:
        INST = os.path.join(runner.hgtmp, "install")
        BINDIR = os.environ["BINDIR"] = os.path.join(INST, "bin")
        TMPBINDIR = BINDIR
        PYTHONDIR = os.path.join(INST, "lib", "python")

    os.environ["BINDIR"] = BINDIR
    os.environ["PYTHON"] = PYTHON

    path = [BINDIR] + os.environ["PATH"].split(os.pathsep)

21343:93511a595766

           ' build %(compiler)s --build-base="%(base)s"'
           ' install --force --prefix="%(prefix)s" --install-lib="%(libdir)s"'
           ' --install-scripts="%(bindir)s" %(nohome)s >%(logfile)s 2>&1'
           % {'exe': sys.executable, 'py3': py3, 'pure': pure,
              'compiler': compiler, 'base': os.path.join(runner.hgtmp, "build"),
              'prefix': runner.inst, 'libdir': PYTHONDIR, 'bindir': BINDIR,
              'nohome': nohome, 'logfile': installerrs})
    vlog("# Running", cmd)
    if os.system(cmd) == 0:
        if not options.verbose:
            os.remove(installerrs)

        vlog('# Installing coverage trigger to %s' % target)
        shutil.copyfile(custom, target)
        rc = os.path.join(runner.testdir, '.coveragerc')
        vlog('# Installing coverage rc to %s' % rc)
        os.environ['COVERAGE_PROCESS_START'] = rc
        fn = os.path.join(runner.inst, '..', '.coverage')
        os.environ['COVERAGE_FILE'] = fn

def outputtimes(options):
    vlog('# Producing time report')
    times.sort(key=lambda t: (t[1], t[0]), reverse=True)

    except KeyboardInterrupt:
        abort = True

def runtests(runner, options, tests):
    try:
        if runner.inst:
            installhg(runner, options)
            _checkhglib("Testing")
        else:
            usecorrectpython()

    Tests rely on a lot of state. This object holds it for them.
    """
    def __init__(self):
        self.testdir = None
        self.hgtmp = None
        self.inst = None

def main(args, parser=None):
    runner = TestRunner()

    parser = parser or getparser()

    if 'PYTHONHASHSEED' not in os.environ:
        # use a random python hash seed all the time
        # we do the randomness ourself to know what seed is used
        os.environ['PYTHONHASHSEED'] = str(random.getrandbits(32))

    global BINDIR, TMPBINDIR, PYTHONDIR, COVERAGE_FILE
    runner.testdir = os.environ['TESTDIR'] = os.getcwd()
    if options.tmpdir:
        options.keep_tmpdir = True
        tmpdir = options.tmpdir
        if os.path.exists(tmpdir):

            d = os.getenv('TMP')
        tmpdir = tempfile.mkdtemp('', 'hgtests.', d)
    runner.hgtmp = os.environ['HGTMP'] = os.path.realpath(tmpdir)

    if options.with_hg:
        runner.inst = None
        BINDIR = os.path.dirname(os.path.realpath(options.with_hg))
        TMPBINDIR = os.path.join(runner.hgtmp, 'install', 'bin')
        os.makedirs(TMPBINDIR)

        # This looks redundant with how Python initializes sys.path from

        # "hg" specified by --with-hg is not the only Python script
        # executed in the test suite that needs to import 'mercurial'
        # ... which means it's not really redundant at all.
        PYTHONDIR = BINDIR
    else:
        runner.inst = os.path.join(runner.hgtmp, "install")
        BINDIR = os.environ["BINDIR"] = os.path.join(runner.inst, "bin")
        TMPBINDIR = BINDIR
        PYTHONDIR = os.path.join(runner.inst, "lib", "python")

    os.environ["BINDIR"] = BINDIR
    os.environ["PYTHON"] = PYTHON

    path = [BINDIR] + os.environ["PATH"].split(os.pathsep)