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

Side by Side Diff: test/same-gyp-name/gyptest-all.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 Build a .gyp that depends on 2 gyp files with the same name. 8 Build a .gyp that depends on 2 gyp files with the same name.
9 """ 9 """
10 10
(...skipping 14 matching lines...) Expand all
25 expect2 = """\ 25 expect2 = """\
26 Hello from main2.cc 26 Hello from main2.cc
27 """ 27 """
28 28
29 if test.format == 'xcode': 29 if test.format == 'xcode':
30 chdir1 = 'relocate/src/subdir1' 30 chdir1 = 'relocate/src/subdir1'
31 chdir2 = 'relocate/src/subdir2' 31 chdir2 = 'relocate/src/subdir2'
32 else: 32 else:
33 chdir1 = chdir2 = 'relocate/src' 33 chdir1 = chdir2 = 'relocate/src'
34 34
35 test.run_built_executable('program1', chdir=chdir1, stdout=expect1) 35 if test.format == 'android':
36 test.run_built_executable('program2', chdir=chdir2, stdout=expect2) 36 test.run_built_executable('program1', chdir=chdir1, stdout=expect1,
37 subdir='subdir1')
38 test.run_built_executable('program2', chdir=chdir2, stdout=expect2,
39 subdir='subdir2')
40 else:
41 test.run_built_executable('program1', chdir=chdir1, stdout=expect1)
42 test.run_built_executable('program2', chdir=chdir2, stdout=expect2)
37 43
38 test.pass_test() 44 test.pass_test()
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698