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

Unified Diff: test/rules/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 side-by-side diff with in-line comments
Download patch
Index: test/rules/gyptest-all.py
diff --git a/test/rules/gyptest-all.py b/test/rules/gyptest-all.py
index 99b2109af804763e2d7010dd79729a60216318c0..471438cf82fb680f054b4b4f2b2a5057f9fe425f 100755
--- a/test/rules/gyptest-all.py
+++ b/test/rules/gyptest-all.py
@@ -31,7 +31,12 @@ if test.format == 'xcode':
chdir = 'relocate/src/subdir1'
else:
chdir = 'relocate/src'
-test.run_built_executable('program', chdir=chdir, stdout=expect)
+
+if test.format == 'android':
+ test.run_built_executable('program', chdir=chdir, stdout=expect,
+ subdir='subdir1')
+else:
+ test.run_built_executable('program', chdir=chdir, stdout=expect)
expect = """\
Hello from program.c
@@ -42,7 +47,12 @@ if test.format == 'xcode':
chdir = 'relocate/src/subdir3'
else:
chdir = 'relocate/src'
-test.run_built_executable('program2', chdir=chdir, stdout=expect)
+
+if test.format == 'android':
+ test.run_built_executable('program2', chdir=chdir, stdout=expect,
+ subdir='subdir3')
+else:
+ test.run_built_executable('program2', chdir=chdir, stdout=expect)
test.must_match('relocate/src/subdir2/file1.out', 'Hello from file1.in\n')
test.must_match('relocate/src/subdir2/file2.out', 'Hello from file2.in\n')
@@ -68,6 +78,11 @@ if test.format == 'xcode':
chdir = 'relocate/src/subdir4'
else:
chdir = 'relocate/src'
-test.run_built_executable('program4', chdir=chdir, stdout=expect)
+
+if test.format == 'android':
+ test.run_built_executable('program4', chdir=chdir, stdout=expect,
+ subdir='subdir4')
+else:
+ test.run_built_executable('program4', chdir=chdir, stdout=expect)
test.pass_test()

Powered by Google App Engine
This is Rietveld 408576698