comparison tests/run-tests.py @ 19274:6f666780f846

run-tests: introduce threadtmp directory

19273:f3effc499288

            assert '=' in key, ('extra config opt %s must '
                                'have an = for assignment' % opt)
            hgrc.write('[%s]\n%s\n' % (section, key))
    hgrc.close()

def createenv(options, testtmp):
    env = os.environ.copy()
    env['TESTTMP'] = testtmp
    env['HOME'] = testtmp
    env["HGPORT"] = str(options.port)
    env["HGPORT1"] = str(options.port + 1)
    env["HGPORT2"] = str(options.port + 2)
    env["HGRCPATH"] = os.path.join(HGTMP, '.hgrc')
    env["DAEMON_PIDS"] = os.path.join(HGTMP, 'daemon.pids')
    env["HGEDITOR"] = sys.executable + ' -c "import sys; sys.exit(0)"'
    env["HGMERGE"] = "internal:merge"
    env["HGUSER"]   = "test"
    env["HGENCODING"] = "ascii"
    env["HGENCODINGMODE"] = "strict"

    for s, r in replacements:
        output = re.sub(s, r, output)
    return ret, output.splitlines(True)

def runone(options, test):
    '''returns a result element: (code, test, msg)'''

    def skip(msg):
        if options.verbose:
            log("\nSkipping %s: %s" % (testpath, msg))

    if os.path.exists(err):
        os.remove(err)       # Remove any previous output files

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

    replacements = [
        (r':%s\b' % options.port, ':$HGPORT'),
        (r':%s\b' % (options.port + 1), ':$HGPORT1'),

                     '\\' + c
                     for c in testtmp), '$TESTTMP'))
    else:
        replacements.append((re.escape(testtmp), '$TESTTMP'))

    env = createenv(options, testtmp)
    createhgrc(env['HGRCPATH'], options)

    if options.time:
        starttime = time.time()
    ret, out = runner(testpath, testtmp, options, replacements, env)

        sys.stdout.write(result[0])
        sys.stdout.flush()
        iolock.release()

    if not options.keep_tmpdir:
        shutil.rmtree(testtmp, True)
    return result

_hgpath = None

def _gethgpath():

iolock = threading.Lock()
abort = False

def runqueue(options, tests):
    for test in tests:
        code, test, msg = runone(options, test)
        resultslock.acquire()
        results[code].append((test, msg))
        resultslock.release()

        if options.first and code not in '.si':

19274:6f666780f846

            assert '=' in key, ('extra config opt %s must '
                                'have an = for assignment' % opt)
            hgrc.write('[%s]\n%s\n' % (section, key))
    hgrc.close()

def createenv(options, testtmp, threadtmp):
    env = os.environ.copy()
    env['TESTTMP'] = testtmp
    env['HOME'] = testtmp
    env["HGPORT"] = str(options.port)
    env["HGPORT1"] = str(options.port + 1)
    env["HGPORT2"] = str(options.port + 2)
    env["HGRCPATH"] = os.path.join(threadtmp, '.hgrc')
    env["DAEMON_PIDS"] = os.path.join(threadtmp, 'daemon.pids')
    env["HGEDITOR"] = sys.executable + ' -c "import sys; sys.exit(0)"'
    env["HGMERGE"] = "internal:merge"
    env["HGUSER"]   = "test"
    env["HGENCODING"] = "ascii"
    env["HGENCODINGMODE"] = "strict"

    for s, r in replacements:
        output = re.sub(s, r, output)
    return ret, output.splitlines(True)

def runone(options, test, count):
    '''returns a result element: (code, test, msg)'''

    def skip(msg):
        if options.verbose:
            log("\nSkipping %s: %s" % (testpath, msg))

    if os.path.exists(err):
        os.remove(err)       # Remove any previous output files

    # Make a tmp subdirectory to work in
    threadtmp = os.path.join(HGTMP, "child%d" % count)
    testtmp = os.path.join(threadtmp, os.path.basename(test))
    os.mkdir(threadtmp)
    os.mkdir(testtmp)

    replacements = [
        (r':%s\b' % options.port, ':$HGPORT'),
        (r':%s\b' % (options.port + 1), ':$HGPORT1'),

                     '\\' + c
                     for c in testtmp), '$TESTTMP'))
    else:
        replacements.append((re.escape(testtmp), '$TESTTMP'))

    env = createenv(options, testtmp, threadtmp)
    createhgrc(env['HGRCPATH'], options)

    if options.time:
        starttime = time.time()
    ret, out = runner(testpath, testtmp, options, replacements, env)

        sys.stdout.write(result[0])
        sys.stdout.flush()
        iolock.release()

    if not options.keep_tmpdir:
        shutil.rmtree(threadtmp, True)
    return result

_hgpath = None

def _gethgpath():

iolock = threading.Lock()
abort = False

def runqueue(options, tests):
    for test in tests:
        code, test, msg = runone(options, test, 0)
        resultslock.acquire()
        results[code].append((test, msg))
        resultslock.release()

        if options.first and code not in '.si':