##// END OF EJS Templates
run-tests: add a --compiler option...
Bryan O'Sullivan -
r17966:ae20cde0 default
parent child Browse files
Show More
@@ -163,6 +163,8 b' def parseargs():'
163 parser.add_option("-p", "--port", type="int",
163 parser.add_option("-p", "--port", type="int",
164 help="port on which servers should listen"
164 help="port on which servers should listen"
165 " (default: $%s or %d)" % defaults['port'])
165 " (default: $%s or %d)" % defaults['port'])
166 parser.add_option("--compiler", type="string",
167 help="compiler to build with")
166 parser.add_option("--pure", action="store_true",
168 parser.add_option("--pure", action="store_true",
167 help="use pure Python code instead of C extensions")
169 help="use pure Python code instead of C extensions")
168 parser.add_option("-R", "--restart", action="store_true",
170 parser.add_option("-R", "--restart", action="store_true",
@@ -371,6 +373,9 b' def usecorrectpython():'
371 def installhg(options):
373 def installhg(options):
372 vlog("# Performing temporary installation of HG")
374 vlog("# Performing temporary installation of HG")
373 installerrs = os.path.join("tests", "install.err")
375 installerrs = os.path.join("tests", "install.err")
376 compiler = ''
377 if options.compiler:
378 compiler = '--compiler ' + options.compiler
374 pure = options.pure and "--pure" or ""
379 pure = options.pure and "--pure" or ""
375
380
376 # Run installer in hg root
381 # Run installer in hg root
@@ -385,10 +390,10 b' def installhg(options):'
385 # when they happen.
390 # when they happen.
386 nohome = ''
391 nohome = ''
387 cmd = ('%(exe)s setup.py %(pure)s clean --all'
392 cmd = ('%(exe)s setup.py %(pure)s clean --all'
388 ' build --build-base="%(base)s"'
393 ' build %(compiler)s --build-base="%(base)s"'
389 ' install --force --prefix="%(prefix)s" --install-lib="%(libdir)s"'
394 ' install --force --prefix="%(prefix)s" --install-lib="%(libdir)s"'
390 ' --install-scripts="%(bindir)s" %(nohome)s >%(logfile)s 2>&1'
395 ' --install-scripts="%(bindir)s" %(nohome)s >%(logfile)s 2>&1'
391 % dict(exe=sys.executable, pure=pure,
396 % dict(exe=sys.executable, pure=pure, compiler=compiler,
392 base=os.path.join(HGTMP, "build"),
397 base=os.path.join(HGTMP, "build"),
393 prefix=INST, libdir=PYTHONDIR, bindir=BINDIR,
398 prefix=INST, libdir=PYTHONDIR, bindir=BINDIR,
394 nohome=nohome, logfile=installerrs))
399 nohome=nohome, logfile=installerrs))
General Comments 0
You need to be logged in to leave comments. Login now