Index: test/actions/gyptest-all.py |
diff --git a/test/actions/gyptest-all.py b/test/actions/gyptest-all.py |
index 705fec4b5fdb7d2bb7bd16f81ab768fad2a22218..5d0824d65d407989e2e807c4eb61988e2336acc2 100755 |
--- a/test/actions/gyptest-all.py |
+++ b/test/actions/gyptest-all.py |
@@ -53,7 +53,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') |
Torne
2014/06/11 12:44:18
Why do we need to add subdirs here? Perhaps we can
jbudorick
2014/06/11 16:30:22
I'm not sure if we can change how the generator de
Torne
2014/06/11 16:41:39
I don't understand what the subdir parameter here
|
+else: |
+ test.run_built_executable('program', chdir=chdir, stdout=expect) |
test.must_match('relocate/src/subdir2/file.out', "Hello from make-file.py\n") |
@@ -65,7 +70,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) |
# Clean out files which may have been created if test.ALL was run. |