autotest: added defaults_file option to start_SIL()

This commit is contained in:
Andrew Tridgell 2016-01-09 16:26:51 +11:00
parent 5a24e93cc5
commit 9e43d5a4bb

View File

@ -105,7 +105,7 @@ def pexpect_drain(p):
except pexpect.TIMEOUT: except pexpect.TIMEOUT:
pass pass
def start_SIL(atype, valgrind=False, wipe=False, synthetic_clock=True, home=None, model=None, speedup=1): def start_SIL(atype, valgrind=False, wipe=False, synthetic_clock=True, home=None, model=None, speedup=1, defaults_file=None):
'''launch a SIL instance''' '''launch a SIL instance'''
import pexpect import pexpect
cmd="" cmd=""
@ -125,6 +125,8 @@ def start_SIL(atype, valgrind=False, wipe=False, synthetic_clock=True, home=None
cmd += ' --model=%s' % model cmd += ' --model=%s' % model
if speedup != 1: if speedup != 1:
cmd += ' --speedup=%f' % speedup cmd += ' --speedup=%f' % speedup
if defaults_file is not None:
cmd += ' --defaults=%s' % defaults_file
print("Running: %s" % cmd) print("Running: %s" % cmd)
ret = pexpect.spawn(cmd, logfile=sys.stdout, timeout=5) ret = pexpect.spawn(cmd, logfile=sys.stdout, timeout=5)
ret.delaybeforesend = 0 ret.delaybeforesend = 0