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

Unified Diff: test/actions/gyptest-default.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/actions/gyptest-default.py
diff --git a/test/actions/gyptest-default.py b/test/actions/gyptest-default.py
index f5b4e35105857dbf8d128d762bf6c12b647c382a..d48634a38550abfb6628e72d3fa522cff5f31fa5 100755
--- a/test/actions/gyptest-default.py
+++ b/test/actions/gyptest-default.py
@@ -51,7 +51,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)
test.must_match('relocate/src/subdir2/file.out', "Hello from make-file.py\n")
@@ -63,7 +68,12 @@ if test.format == 'xcode':
chdir = 'relocate/src/subdir3'
else:
chdir = 'relocate/src'
-test.run_built_executable('null_input', chdir=chdir, stdout=expect)
+
+if test.format == 'android':
+ test.run_built_executable('null_input', chdir=chdir, stdout=expect,
+ subdir='subdir3')
+else:
+ test.run_built_executable('null_input', chdir=chdir, stdout=expect)
test.pass_test()

Powered by Google App Engine
This is Rietveld 408576698