Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/run-tests.py @ 4385:93a4e72b4f83

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
run-tests.py: pass -L/--label to simplemerge This should give us conflict markers that don't change from one run to another. Remove some sed's/egrep's from some tests.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sat, 28 Apr 2007 17:55:45 -0300
parents 46280c004f22
children 860478527568
comparison
equal deleted inserted replaced
4384:1386a9cffc88 4385:93a4e72b4f83
344 HGTMP = os.environ["HGTMP"] = tempfile.mkdtemp("", "hgtests.") 344 HGTMP = os.environ["HGTMP"] = tempfile.mkdtemp("", "hgtests.")
345 DAEMON_PIDS = os.environ["DAEMON_PIDS"] = os.path.join(HGTMP, 'daemon.pids') 345 DAEMON_PIDS = os.environ["DAEMON_PIDS"] = os.path.join(HGTMP, 'daemon.pids')
346 HGRCPATH = os.environ["HGRCPATH"] = os.path.join(HGTMP, '.hgrc') 346 HGRCPATH = os.environ["HGRCPATH"] = os.path.join(HGTMP, '.hgrc')
347 347
348 os.environ["HGEDITOR"] = sys.executable + ' -c "import sys; sys.exit(0)"' 348 os.environ["HGEDITOR"] = sys.executable + ' -c "import sys; sys.exit(0)"'
349 os.environ["HGMERGE"] = 'python "%s"' % os.path.join(TESTDIR, os.path.pardir, 349 os.environ["HGMERGE"] = ('python "%s" -L my -L other'
350 'contrib', 'simplemerge') 350 % os.path.join(TESTDIR, os.path.pardir, 'contrib',
351 'simplemerge'))
351 os.environ["HGUSER"] = "test" 352 os.environ["HGUSER"] = "test"
352 os.environ["HGENCODING"] = "ascii" 353 os.environ["HGENCODING"] = "ascii"
353 os.environ["HGENCODINGMODE"] = "strict" 354 os.environ["HGENCODINGMODE"] = "strict"
354 355
355 vlog("# Using TESTDIR", TESTDIR) 356 vlog("# Using TESTDIR", TESTDIR)