Index: tools/test-wrapper-gypbuild.py |
diff --git a/tools/test-wrapper-gypbuild.py b/tools/test-wrapper-gypbuild.py |
index ad5449a4046862d8c3ae2910eeded766857e9739..51ff791d35a5d9f30991c724871d3476f63c61d5 100755 |
--- a/tools/test-wrapper-gypbuild.py |
+++ b/tools/test-wrapper-gypbuild.py |
@@ -131,16 +131,20 @@ def BuildOptions(): |
def ProcessOptions(options): |
- if options.arch_and_mode != None and options.arch_and_mode != "": |
- tokens = options.arch_and_mode.split(".") |
- options.arch = tokens[0] |
- options.mode = tokens[1] |
- options.mode = options.mode.split(',') |
+ if options.arch_and_mode == ".": |
+ options.arch = [] |
+ options.mode = [] |
+ else: |
+ if options.arch_and_mode != None and options.arch_and_mode != "": |
+ tokens = options.arch_and_mode.split(".") |
+ options.arch = tokens[0] |
+ options.mode = tokens[1] |
+ options.mode = options.mode.split(',') |
+ options.arch = options.arch.split(',') |
for mode in options.mode: |
if not mode in ['debug', 'release']: |
print "Unknown mode %s" % mode |
return False |
- options.arch = options.arch.split(',') |
for arch in options.arch: |
if not arch in ['ia32', 'x64', 'arm']: |
print "Unknown architecture %s" % arch |
@@ -232,6 +236,18 @@ def Main(): |
env=env) |
returncodes += child.wait() |
+ if len(options.mode) == 0 and len(options.arch) == 0: |
+ print ">>> running tests" |
+ shellpath = workspace + '/' + options.outdir |
+ env['LD_LIBRARY_PATH'] = shellpath + '/lib.target' |
+ shell = shellpath + '/d8' |
+ child = subprocess.Popen(' '.join(args_for_children + |
+ ['--shell=' + shell]), |
+ shell=True, |
+ cwd=workspace, |
+ env=env) |
+ returncodes = child.wait() |
+ |
return returncodes |