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

Side by Side Diff: Makefile

Issue 10836049: Android: increase default test timeout and skip time sensitive mjsunit/regress/regress-1969. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 8 years, 4 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 | test/mjsunit/mjsunit.status » ('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 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 @tools/test-wrapper-gypbuild.py $(TESTJOBS) --outdir=$(OUTDIR) \ 203 @tools/test-wrapper-gypbuild.py $(TESTJOBS) --outdir=$(OUTDIR) \
204 --arch-and-mode=$(basename $@) $(TESTFLAGS) 204 --arch-and-mode=$(basename $@) $(TESTFLAGS)
205 205
206 $(addsuffix .sync, $(ANDROID_BUILDS)): $$(basename $$@) 206 $(addsuffix .sync, $(ANDROID_BUILDS)): $$(basename $$@)
207 @tools/android-sync.sh $(basename $@) $(OUTDIR) \ 207 @tools/android-sync.sh $(basename $@) $(OUTDIR) \
208 $(shell pwd) $(ANDROID_V8) 208 $(shell pwd) $(ANDROID_V8)
209 209
210 $(addsuffix .check, $(ANDROID_BUILDS)): $$(basename $$@).sync 210 $(addsuffix .check, $(ANDROID_BUILDS)): $$(basename $$@).sync
211 @tools/test-wrapper-gypbuild.py $(TESTJOBS) --outdir=$(OUTDIR) \ 211 @tools/test-wrapper-gypbuild.py $(TESTJOBS) --outdir=$(OUTDIR) \
212 --arch-and-mode=$(basename $@) \ 212 --arch-and-mode=$(basename $@) \
213 --timeout=600 \
213 --special-command="tools/android-run.py @" 214 --special-command="tools/android-run.py @"
214 215
215 $(addsuffix .check, $(ANDROID_ARCHES)): \ 216 $(addsuffix .check, $(ANDROID_ARCHES)): \
216 $(addprefix $$(basename $$@).,$(MODES)).check 217 $(addprefix $$(basename $$@).,$(MODES)).check
217 218
218 native.check: native 219 native.check: native
219 @tools/test-wrapper-gypbuild.py $(TESTJOBS) --outdir=$(OUTDIR)/native \ 220 @tools/test-wrapper-gypbuild.py $(TESTJOBS) --outdir=$(OUTDIR)/native \
220 --arch-and-mode=. $(TESTFLAGS) 221 --arch-and-mode=. $(TESTFLAGS)
221 222
222 # Clean targets. You can clean each architecture individually, or everything. 223 # Clean targets. You can clean each architecture individually, or everything.
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 262
262 # Stores current GYPFLAGS in a file. 263 # Stores current GYPFLAGS in a file.
263 $(ENVFILE).new: 264 $(ENVFILE).new:
264 @mkdir -p $(OUTDIR); echo "GYPFLAGS=$(GYPFLAGS)" > $(ENVFILE).new; \ 265 @mkdir -p $(OUTDIR); echo "GYPFLAGS=$(GYPFLAGS)" > $(ENVFILE).new; \
265 echo "CXX=$(CXX)" >> $(ENVFILE).new 266 echo "CXX=$(CXX)" >> $(ENVFILE).new
266 267
267 # Dependencies. 268 # Dependencies.
268 dependencies: 269 dependencies:
269 svn checkout --force http://gyp.googlecode.com/svn/trunk build/gyp \ 270 svn checkout --force http://gyp.googlecode.com/svn/trunk build/gyp \
270 --revision 1282 271 --revision 1282
OLDNEW
« no previous file with comments | « no previous file | test/mjsunit/mjsunit.status » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698