Skip to content

Commit

Permalink
Add presubmit=no and werror=no flags to Makefile
Browse files Browse the repository at this point in the history
  • Loading branch information
jkummerow@chromium.org committed Oct 6, 2011
1 parent 918922b commit 11d79c5
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 8 deletions.
20 changes: 15 additions & 5 deletions Makefile
Expand Up @@ -32,6 +32,7 @@ LINK ?= "g++"
OUTDIR ?= out
TESTJOBS ?= -j16
GYPFLAGS ?=
TESTFLAGS ?=

# Special build flags. Use them like this: "make library=shared"

Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)):
Expand Down
3 changes: 2 additions & 1 deletion build/common.gypi
Expand Up @@ -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%': '',
Expand Down Expand Up @@ -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' ],
}],
],
Expand Down
3 changes: 2 additions & 1 deletion build/standalone.gypi
Expand Up @@ -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")', {
Expand All @@ -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', ],
Expand Down
7 changes: 6 additions & 1 deletion tools/presubmit.py
Expand Up @@ -211,7 +211,12 @@ def ProcessFiles(self, files, path):
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()
Expand Down

0 comments on commit 11d79c5

Please sign in to comment.