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

Side by Side Diff: test/sibling/gyptest-relocate.py

Issue 321953005: [gyp][Android] Implement TestGypAndroid.run_built_executable. (Closed) Base URL: http://gyp.googlecode.com/svn/trunk
Patch Set: Created 6 years, 6 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
OLDNEW
1 #!/usr/bin/env python 1 #!/usr/bin/env python
2 2
3 # Copyright (c) 2012 Google Inc. All rights reserved. 3 # Copyright (c) 2012 Google Inc. All rights reserved.
4 # Use of this source code is governed by a BSD-style license that can be 4 # Use of this source code is governed by a BSD-style license that can be
5 # found in the LICENSE file. 5 # found in the LICENSE file.
6 6
7 """ 7 """
8 """ 8 """
9 9
10 import TestGyp 10 import TestGyp
(...skipping 10 matching lines...) Expand all
21 21
22 # The top-level Makefile is in the directory where gyp was run. 22 # The top-level Makefile is in the directory where gyp was run.
23 # TODO(mmoss) Should the Makefile go in the directory of the passed in .gyp 23 # TODO(mmoss) Should the Makefile go in the directory of the passed in .gyp
24 # file? What about when passing in multiple .gyp files? Would sub-project 24 # file? What about when passing in multiple .gyp files? Would sub-project
25 # Makefiles (see http://codereview.chromium.org/340008 comments) solve this? 25 # Makefiles (see http://codereview.chromium.org/340008 comments) solve this?
26 if test.format in ('make', 'ninja', 'cmake'): 26 if test.format in ('make', 'ninja', 'cmake'):
27 chdir = 'relocate/src' 27 chdir = 'relocate/src'
28 28
29 if test.format == 'xcode': 29 if test.format == 'xcode':
30 chdir = 'relocate/src/prog1' 30 chdir = 'relocate/src/prog1'
31 test.run_built_executable('program1', 31
32 chdir=chdir, 32 if test.format == 'android':
33 stdout="Hello from prog1.c\n") 33 test.run_built_executable('program1', stdout="Hello from prog1.c\n",
34 chdir=chdir, subdir='prog1')
35 else:
36 test.run_built_executable('program1', stdout="Hello from prog1.c\n",
37 chdir=chdir)
34 38
35 if test.format == 'xcode': 39 if test.format == 'xcode':
36 chdir = 'relocate/src/prog2' 40 chdir = 'relocate/src/prog2'
37 test.run_built_executable('program2', 41
38 chdir=chdir, 42 if test.format == 'android':
39 stdout="Hello from prog2.c\n") 43 test.run_built_executable('program2', stdout="Hello from prog2.c\n",
44 chdir=chdir, subdir='prog2')
45 else:
46 test.run_built_executable('program2', stdout="Hello from prog2.c\n",
47 chdir=chdir)
40 48
41 test.pass_test() 49 test.pass_test()
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698