Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(372)

Side by Side Diff: Makefile

Issue 11184039: Use tools/run-tests.py for "check" targets in the top-level Makefile. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: fixed run-tests.py return value Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | tools/run-tests.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2012 the V8 project authors. All rights reserved. 1 # Copyright 2012 the V8 project authors. All rights reserved.
2 # Redistribution and use in source and binary forms, with or without 2 # Redistribution and use in source and binary forms, with or without
3 # modification, are permitted provided that the following conditions are 3 # modification, are permitted provided that the following conditions are
4 # met: 4 # met:
5 # 5 #
6 # * Redistributions of source code must retain the above copyright 6 # * Redistributions of source code must retain the above copyright
7 # notice, this list of conditions and the following disclaimer. 7 # notice, this list of conditions and the following disclaimer.
8 # * Redistributions in binary form must reproduce the above 8 # * Redistributions in binary form must reproduce the above
9 # copyright notice, this list of conditions and the following 9 # copyright notice, this list of conditions and the following
10 # disclaimer in the documentation and/or other materials provided 10 # disclaimer in the documentation and/or other materials provided
(...skipping 12 matching lines...) Expand all
23 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 23 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
24 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 24 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 25 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
26 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 26 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 27
28 28
29 # Variable default definitions. Override them by exporting them in your shell. 29 # Variable default definitions. Override them by exporting them in your shell.
30 CXX ?= g++ 30 CXX ?= g++
31 LINK ?= g++ 31 LINK ?= g++
32 OUTDIR ?= out 32 OUTDIR ?= out
33 TESTJOBS ?= -j16 33 TESTJOBS ?=
34 GYPFLAGS ?= 34 GYPFLAGS ?=
35 TESTFLAGS ?= 35 TESTFLAGS ?=
36 ANDROID_NDK_ROOT ?= 36 ANDROID_NDK_ROOT ?=
37 ANDROID_TOOLCHAIN ?= 37 ANDROID_TOOLCHAIN ?=
38 ANDROID_V8 ?= /data/local/v8 38 ANDROID_V8 ?= /data/local/v8
39 39
40 # Special build flags. Use them like this: "make library=shared" 40 # Special build flags. Use them like this: "make library=shared"
41 41
42 # library=shared || component=shared_library 42 # library=shared || component=shared_library
43 ifeq ($(library), shared) 43 ifeq ($(library), shared)
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 $(ANDROID_BUILDS): $(GYPFILES) $(ENVFILE) build/android.gypi \ 196 $(ANDROID_BUILDS): $(GYPFILES) $(ENVFILE) build/android.gypi \
197 must-set-ANDROID_NDK_ROOT_OR_TOOLCHAIN Makefile.android 197 must-set-ANDROID_NDK_ROOT_OR_TOOLCHAIN Makefile.android
198 @$(MAKE) -f Makefile.android $@ \ 198 @$(MAKE) -f Makefile.android $@ \
199 ARCH="$(basename $@)" \ 199 ARCH="$(basename $@)" \
200 MODE="$(subst .,,$(suffix $@))" \ 200 MODE="$(subst .,,$(suffix $@))" \
201 OUTDIR="$(OUTDIR)" \ 201 OUTDIR="$(OUTDIR)" \
202 GYPFLAGS="$(GYPFLAGS)" 202 GYPFLAGS="$(GYPFLAGS)"
203 203
204 # Test targets. 204 # Test targets.
205 check: all 205 check: all
206 » @tools/test-wrapper-gypbuild.py $(TESTJOBS) --outdir=$(OUTDIR) \ 206 » @tools/run-tests.py $(TESTJOBS) --outdir=$(OUTDIR) \
207 --arch=$(shell echo $(DEFAULT_ARCHES) | sed -e 's/ /,/g') \ 207 --arch=$(shell echo $(DEFAULT_ARCHES) | sed -e 's/ /,/g') \
208 $(TESTFLAGS) 208 $(TESTFLAGS)
209 209
210 $(addsuffix .check,$(MODES)): $$(basename $$@) 210 $(addsuffix .check,$(MODES)): $$(basename $$@)
211 » @tools/test-wrapper-gypbuild.py $(TESTJOBS) --outdir=$(OUTDIR) \ 211 » @tools/run-tests.py $(TESTJOBS) --outdir=$(OUTDIR) \
212 --mode=$(basename $@) $(TESTFLAGS) 212 --mode=$(basename $@) $(TESTFLAGS)
213 213
214 $(addsuffix .check,$(ARCHES)): $$(basename $$@) 214 $(addsuffix .check,$(ARCHES)): $$(basename $$@)
215 » @tools/test-wrapper-gypbuild.py $(TESTJOBS) --outdir=$(OUTDIR) \ 215 » @tools/run-tests.py $(TESTJOBS) --outdir=$(OUTDIR) \
216 --arch=$(basename $@) $(TESTFLAGS) 216 --arch=$(basename $@) $(TESTFLAGS)
217 217
218 $(CHECKS): $$(basename $$@) 218 $(CHECKS): $$(basename $$@)
219 » @tools/test-wrapper-gypbuild.py $(TESTJOBS) --outdir=$(OUTDIR) \ 219 » @tools/run-tests.py $(TESTJOBS) --outdir=$(OUTDIR) \
220 --arch-and-mode=$(basename $@) $(TESTFLAGS) 220 --arch-and-mode=$(basename $@) $(TESTFLAGS)
221 221
222 $(addsuffix .sync, $(ANDROID_BUILDS)): $$(basename $$@) 222 $(addsuffix .sync, $(ANDROID_BUILDS)): $$(basename $$@)
223 @tools/android-sync.sh $(basename $@) $(OUTDIR) \ 223 @tools/android-sync.sh $(basename $@) $(OUTDIR) \
224 $(shell pwd) $(ANDROID_V8) 224 $(shell pwd) $(ANDROID_V8)
225 225
226 $(addsuffix .check, $(ANDROID_BUILDS)): $$(basename $$@).sync 226 $(addsuffix .check, $(ANDROID_BUILDS)): $$(basename $$@).sync
227 » @tools/test-wrapper-gypbuild.py $(TESTJOBS) --outdir=$(OUTDIR) \ 227 » @tools/run-tests.py $(TESTJOBS) --outdir=$(OUTDIR) \
228 --arch-and-mode=$(basename $@) \ 228 --arch-and-mode=$(basename $@) \
229 --timeout=600 \ 229 --timeout=600 \
230 » --special-command="tools/android-run.py @" 230 » --command-prefix="tools/android-run.py"
231 231
232 $(addsuffix .check, $(ANDROID_ARCHES)): \ 232 $(addsuffix .check, $(ANDROID_ARCHES)): \
233 $(addprefix $$(basename $$@).,$(MODES)).check 233 $(addprefix $$(basename $$@).,$(MODES)).check
234 234
235 native.check: native 235 native.check: native
236 » @tools/test-wrapper-gypbuild.py $(TESTJOBS) --outdir=$(OUTDIR)/native \ 236 » @tools/run-tests.py $(TESTJOBS) --outdir=$(OUTDIR)/native \
237 --arch-and-mode=. $(TESTFLAGS) 237 --arch-and-mode=. $(TESTFLAGS)
238 238
239 # Clean targets. You can clean each architecture individually, or everything. 239 # Clean targets. You can clean each architecture individually, or everything.
240 $(addsuffix .clean, $(ARCHES) $(ANDROID_ARCHES)): 240 $(addsuffix .clean, $(ARCHES) $(ANDROID_ARCHES)):
241 rm -f $(OUTDIR)/Makefile.$(basename $@) 241 rm -f $(OUTDIR)/Makefile.$(basename $@)
242 rm -rf $(OUTDIR)/$(basename $@).release 242 rm -rf $(OUTDIR)/$(basename $@).release
243 rm -rf $(OUTDIR)/$(basename $@).debug 243 rm -rf $(OUTDIR)/$(basename $@).debug
244 find $(OUTDIR) -regex '.*\(host\|target\).$(basename $@)\.mk' -delete 244 find $(OUTDIR) -regex '.*\(host\|target\).$(basename $@)\.mk' -delete
245 245
246 native.clean: 246 native.clean:
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
281 # Stores current GYPFLAGS in a file. 281 # Stores current GYPFLAGS in a file.
282 $(ENVFILE).new: 282 $(ENVFILE).new:
283 @mkdir -p $(OUTDIR); echo "GYPFLAGS=$(GYPFLAGS)" > $(ENVFILE).new; \ 283 @mkdir -p $(OUTDIR); echo "GYPFLAGS=$(GYPFLAGS)" > $(ENVFILE).new; \
284 echo "CXX=$(CXX)" >> $(ENVFILE).new 284 echo "CXX=$(CXX)" >> $(ENVFILE).new
285 285
286 # Dependencies. 286 # Dependencies.
287 # Remember to keep these in sync with the DEPS file. 287 # Remember to keep these in sync with the DEPS file.
288 dependencies: 288 dependencies:
289 svn checkout --force http://gyp.googlecode.com/svn/trunk build/gyp \ 289 svn checkout --force http://gyp.googlecode.com/svn/trunk build/gyp \
290 --revision 1501 290 --revision 1501
OLDNEW
« no previous file with comments | « no previous file | tools/run-tests.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698