Add tools/presubmit.py call to tools/test-wrapper-gypbuild.py

Review URL: http://codereview.chromium.org/7785025

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@9081 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 227e679c
...@@ -98,8 +98,9 @@ CHECKS = $(addsuffix .check,$(BUILDS)) ...@@ -98,8 +98,9 @@ CHECKS = $(addsuffix .check,$(BUILDS))
# File where previously used GYPFLAGS are stored. # File where previously used GYPFLAGS are stored.
ENVFILE = $(OUTDIR)/environment ENVFILE = $(OUTDIR)/environment
.PHONY: all clean $(ENVFILE).new \ .PHONY: all check clean $(ENVFILE).new \
$(ARCHES) $(MODES) $(BUILDS) $(addsuffix .clean,$(ARCHES)) $(ARCHES) $(MODES) $(BUILDS) $(CHECKS) $(addsuffix .clean,$(ARCHES)) \
$(addsuffix .check,$(MODES)) $(addsuffix .check,$(ARCHES))
# Target definitions. "all" is the default. # Target definitions. "all" is the default.
all: $(MODES) all: $(MODES)
......
...@@ -53,6 +53,9 @@ def BuildOptions(): ...@@ -53,6 +53,9 @@ def BuildOptions():
result.add_option("--outdir", result.add_option("--outdir",
help='Base output directory', help='Base output directory',
default='out') default='out')
result.add_option("--no-presubmit",
help='Skip presubmit checks',
default=False, action="store_true")
# Flags this wrapper script handles itself: # Flags this wrapper script handles itself:
result.add_option("-m", "--mode", result.add_option("-m", "--mode",
...@@ -202,6 +205,11 @@ def Main(): ...@@ -202,6 +205,11 @@ def Main():
return 1 return 1
workspace = abspath(join(dirname(sys.argv[0]), '..')) workspace = abspath(join(dirname(sys.argv[0]), '..'))
if not options.no_presubmit:
print ">>> running presubmit tests"
subprocess.call([workspace + '/tools/presubmit.py'])
args_for_children = [workspace + '/tools/test.py'] + PassOnOptions(options) args_for_children = [workspace + '/tools/test.py'] + PassOnOptions(options)
args_for_children += ['--no-build', '--build-system=gyp'] args_for_children += ['--no-build', '--build-system=gyp']
for arg in args: for arg in args:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment