comparison tests/run-tests.py @ 21346:02087bc4f143

run-tests: move PYTHONDIR out of a global

21345:8e7b0f4d6ac7

           ' 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': runner.bindir,
              'nohome': nohome, 'logfile': installerrs})
    vlog("# Running", cmd)
    if os.system(cmd) == 0:
        if not options.verbose:

        else:
            print 'WARNING: cannot fix hg.bat reference to python.exe'

    if options.anycoverage:
        custom = os.path.join(runner.testdir, 'sitecustomize.py')
        target = os.path.join(PYTHONDIR, 'sitecustomize.py')
        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

        print cols % (timetaken, test)

def outputcoverage(runner, options):

    vlog('# Producing coverage report')
    os.chdir(PYTHONDIR)

    def covrun(*args):
        cmd = 'coverage %s' % ' '.join(args)
        vlog('# Running: %s' % cmd)
        os.system(cmd)

        _hgpath = pipe.read().strip()
    finally:
        pipe.close()
    return _hgpath

def _checkhglib(verb):
    """Ensure that the 'mercurial' package imported by python is
    the one we expect it to be.  If not, print a warning to stderr."""
    expecthg = os.path.join(PYTHONDIR, 'mercurial')
    actualhg = _gethgpath()
    if os.path.abspath(actualhg) != os.path.abspath(expecthg):
        sys.stderr.write('warning: %s with unexpected mercurial lib: %s\n'
                         '         (expected %s)\n'
                         % (verb, actualhg, expecthg))

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

        if options.restart:
            orig = list(tests)

                print "Skipped %s: %s" % s
        for s in results['~']:
            print "Warned %s: %s" % s
        for s in results['!']:
            print "Failed %s: %s" % s
        _checkhglib("Tested")
        print "# Ran %d tests, %d skipped, %d warned, %d failed." % (
            tested, skipped + ignored, warned, failed)
        if results['!']:
            print 'python hash seed:', os.environ['PYTHONHASHSEED']
        if options.time:

        self.testdir = None
        self.hgtmp = None
        self.inst = None
        self.bindir = None
        self.tmpbinddir = 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 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):

        # This looks redundant with how Python initializes sys.path from
        # the location of the script being executed.  Needed because the
        # "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 = runner.bindir
    else:
        runner.inst = os.path.join(runner.hgtmp, "install")
        runner.bindir = os.environ["BINDIR"] = os.path.join(runner.inst,
                                                            "bin")
        runner.tmpbindir = runner.bindir
        PYTHONDIR = os.path.join(runner.inst, "lib", "python")

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

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

    # Include TESTDIR in PYTHONPATH so that out-of-tree extensions
    # can run .../tests/run-tests.py test-foo where test-foo
    # adds an extension to HGRC. Also include run-test.py directory to import
    # modules like heredoctest.
    pypath = [PYTHONDIR, runner.testdir,
              os.path.abspath(os.path.dirname(__file__))]
    # We have to augment PYTHONPATH, rather than simply replacing
    # it, in case external libraries are only available via current
    # PYTHONPATH.  (In particular, the Subversion bindings on OS X
    # are in /opt/subversion.)

21346:02087bc4f143

           ' 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': runner.pythondir,
              'bindir': runner.bindir,
              'nohome': nohome, 'logfile': installerrs})
    vlog("# Running", cmd)
    if os.system(cmd) == 0:
        if not options.verbose:

        else:
            print 'WARNING: cannot fix hg.bat reference to python.exe'

    if options.anycoverage:
        custom = os.path.join(runner.testdir, 'sitecustomize.py')
        target = os.path.join(runner.pythondir, 'sitecustomize.py')
        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

        print cols % (timetaken, test)

def outputcoverage(runner, options):

    vlog('# Producing coverage report')
    os.chdir(runner.pythondir)

    def covrun(*args):
        cmd = 'coverage %s' % ' '.join(args)
        vlog('# Running: %s' % cmd)
        os.system(cmd)

        _hgpath = pipe.read().strip()
    finally:
        pipe.close()
    return _hgpath

def _checkhglib(runner, verb):
    """Ensure that the 'mercurial' package imported by python is
    the one we expect it to be.  If not, print a warning to stderr."""
    expecthg = os.path.join(runner.pythondir, 'mercurial')
    actualhg = _gethgpath()
    if os.path.abspath(actualhg) != os.path.abspath(expecthg):
        sys.stderr.write('warning: %s with unexpected mercurial lib: %s\n'
                         '         (expected %s)\n'
                         % (verb, actualhg, expecthg))

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

        if options.restart:
            orig = list(tests)

                print "Skipped %s: %s" % s
        for s in results['~']:
            print "Warned %s: %s" % s
        for s in results['!']:
            print "Failed %s: %s" % s
        _checkhglib(runner, "Tested")
        print "# Ran %d tests, %d skipped, %d warned, %d failed." % (
            tested, skipped + ignored, warned, failed)
        if results['!']:
            print 'python hash seed:', os.environ['PYTHONHASHSEED']
        if options.time:

        self.testdir = None
        self.hgtmp = None
        self.inst = None
        self.bindir = None
        self.tmpbinddir = None
        self.pythondir = 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 COVERAGE_FILE
    runner.testdir = os.environ['TESTDIR'] = os.getcwd()
    if options.tmpdir:
        options.keep_tmpdir = True
        tmpdir = options.tmpdir
        if os.path.exists(tmpdir):

        # This looks redundant with how Python initializes sys.path from
        # the location of the script being executed.  Needed because the
        # "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.
        runner.pythondir = runner.bindir
    else:
        runner.inst = os.path.join(runner.hgtmp, "install")
        runner.bindir = os.environ["BINDIR"] = os.path.join(runner.inst,
                                                            "bin")
        runner.tmpbindir = runner.bindir
        runner.pythondir = os.path.join(runner.inst, "lib", "python")

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

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

    # Include TESTDIR in PYTHONPATH so that out-of-tree extensions
    # can run .../tests/run-tests.py test-foo where test-foo
    # adds an extension to HGRC. Also include run-test.py directory to import
    # modules like heredoctest.
    pypath = [runner.pythondir, runner.testdir,
              os.path.abspath(os.path.dirname(__file__))]
    # We have to augment PYTHONPATH, rather than simply replacing
    # it, in case external libraries are only available via current
    # PYTHONPATH.  (In particular, the Subversion bindings on OS X
    # are in /opt/subversion.)