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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: test/sibling/gyptest-relocate.py
diff --git a/test/sibling/gyptest-relocate.py b/test/sibling/gyptest-relocate.py
index 7296d72564885924839f86f59a4c657131c57c5b..ae1d0d52b387bc2bbeb4382e333e5b2237820445 100755
--- a/test/sibling/gyptest-relocate.py
+++ b/test/sibling/gyptest-relocate.py
@@ -28,14 +28,22 @@ if test.format in ('make', 'ninja', 'cmake'):
if test.format == 'xcode':
chdir = 'relocate/src/prog1'
-test.run_built_executable('program1',
- chdir=chdir,
- stdout="Hello from prog1.c\n")
+
+if test.format == 'android':
+ test.run_built_executable('program1', stdout="Hello from prog1.c\n",
+ chdir=chdir, subdir='prog1')
+else:
+ test.run_built_executable('program1', stdout="Hello from prog1.c\n",
+ chdir=chdir)
if test.format == 'xcode':
chdir = 'relocate/src/prog2'
-test.run_built_executable('program2',
- chdir=chdir,
- stdout="Hello from prog2.c\n")
+
+if test.format == 'android':
+ test.run_built_executable('program2', stdout="Hello from prog2.c\n",
+ chdir=chdir, subdir='prog2')
+else:
+ test.run_built_executable('program2', stdout="Hello from prog2.c\n",
+ chdir=chdir)
test.pass_test()

Powered by Google App Engine
This is Rietveld 408576698