Reviewers: Yang,
Message:
PTAL.
Description:
Add presubmit=no and werror=no flags to Makefile
Please review this at http://codereview.chromium.org/8159015/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files:
M Makefile
M build/common.gypi
M build/standalone.gypi
M tools/presubmit.py
Index: Makefile
diff --git a/Makefile b/Makefile
index
ebf68312b56830fc091faa551b71f75bf70c58c4..76f45d7f2e77e7c83fe9c26e8ab9506ba1c58a08
100644
--- a/Makefile
+++ b/Makefile
@@ -32,6 +32,7 @@ LINK ?= "g++"
OUTDIR ?= out
TESTJOBS ?= -j16
GYPFLAGS ?=
+TESTFLAGS ?=
# Special build flags. Use them like this: "make library=shared"
@@ -76,6 +77,14 @@ endif
ifdef soname_version
GYPFLAGS += -Dsoname_version=$(soname_version)
endif
+# werror=no
+ifeq ($(werror), no)
+ GYPFLAGS += -Dwerror=''
+endif
+# presubmit=no
+ifeq ($(presubmit), no)
+ TESTFLAGS += --no-presubmit
+endif
# ----------------- available targets: --------------------
# - "dependencies": pulls in external dependencies (currently: GYP)
@@ -136,23 +145,24 @@ native: $(OUTDIR)/Makefile-native
# Test targets.
check: all
- @tools/test-wrapper-gypbuild.py $(TESTJOBS) --outdir=$(OUTDIR)
+ @tools/test-wrapper-gypbuild.py $(TESTJOBS) --outdir=$(OUTDIR) \
+ $(TESTFLAGS)
$(addsuffix .check,$(MODES)): $$(basename $$@)
@tools/test-wrapper-gypbuild.py $(TESTJOBS) --outdir=$(OUTDIR) \
- --mode=$(basename $@)
+ --mode=$(basename $@) $(TESTFLAGS)
$(addsuffix .check,$(ARCHES)): $$(basename $$@)
@tools/test-wrapper-gypbuild.py $(TESTJOBS) --outdir=$(OUTDIR) \
- --arch=$(basename $@)
+ --arch=$(basename $@) $(TESTFLAGS)
$(CHECKS): $$(basename $$@)
@tools/test-wrapper-gypbuild.py $(TESTJOBS) --outdir=$(OUTDIR) \
- --arch-and-mode=$(basename $@)
+ --arch-and-mode=$(basename $@) $(TESTFLAGS)
native.check: native
@tools/test-wrapper-gypbuild.py $(TESTJOBS) --outdir=$(OUTDIR)/native \
- --arch-and-mode=.
+ --arch-and-mode=. $(TESTFLAGS)
# Clean targets. You can clean each architecture individually, or
everything.
$(addsuffix .clean,$(ARCHES)):
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index
209e08978b47c19d81161a975b4117e018e0b896..230b1fd7a8ea931975b53275f0510c0de2031567
100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -74,6 +74,7 @@
'v8_use_snapshot%': 'true',
'host_os%': '<(OS)',
'v8_use_liveobjectlist%': 'false',
+ 'werror%': '-Werror',
# For a shared library build, results in "libv8-<(soname_version).so".
'soname_version%': '',
@@ -226,7 +227,7 @@
'cflags': [ '-I/usr/local/include' ],
}],
['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
- 'cflags': [ '-Wall', '-Werror', '-W', '-Wno-unused-parameter',
+ 'cflags':
[ '-Wall', '<(werror)', '-W', '-Wno-unused-parameter',
'-Wnon-virtual-dtor' ],
}],
],
Index: build/standalone.gypi
diff --git a/build/standalone.gypi b/build/standalone.gypi
index
cdece8c57cb8f997c6d6d11549fb32dc83d0271b..f24d9f834105cd758680c4099ef195929d62afe4
100644
--- a/build/standalone.gypi
+++ b/build/standalone.gypi
@@ -58,6 +58,7 @@
'host_arch%': '<(host_arch)',
'target_arch%': '<(target_arch)',
'v8_target_arch%': '<(v8_target_arch)',
+ 'werror%': '-Werror',
'conditions': [
['(v8_target_arch=="arm" and host_arch!="arm") or \
(v8_target_arch=="x64" and host_arch!="x64")', {
@@ -78,7 +79,7 @@
'conditions': [
[ 'OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
'target_defaults': {
- 'cflags': [ '-Wall', '-Werror', '-W', '-Wno-unused-parameter',
+ 'cflags': [ '-Wall', '<(werror)', '-W', '-Wno-unused-parameter',
'-Wnon-virtual-dtor', '-pthread', '-fno-rtti',
'-fno-exceptions', '-pedantic' ],
'ldflags': [ '-pthread', ],
Index: tools/presubmit.py
diff --git a/tools/presubmit.py b/tools/presubmit.py
index
fda7ba96e5957a5b91c98f120af4c1708ed8c9a4..7af6e3d0d80e3a85c7606af692c8b1c249e78922
100755
--- a/tools/presubmit.py
+++ b/tools/presubmit.py
@@ -211,7 +211,12 @@ class CppLintProcessor(SourceFileProcessor):
if exists(local_cpplint):
command = ['python', local_cpplint, '--filter', filt] + join(files)
- process = subprocess.Popen(command, stderr=subprocess.PIPE)
+ try:
+ process = subprocess.Popen(command, stderr=subprocess.PIPE)
+ except:
+ print('Error running cpplint.py. Please make sure you have
depot_tools' +
+ ' in your $PATH. Lint check skipped.')
+ return True
LINT_ERROR_PATTERN = re.compile(r'^(.+)[:(]\d+[:)]')
while True:
out_line = process.stderr.readline()
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
