[gyp][Android] Implement TestGypAndroid.run_built_executable.

test/actions/gyptest-all.py

 #!/usr/bin/env python
 
 # Copyright (c) 2012 Google Inc. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """
 Verifies simple actions when using an explicit build target of 'all'.
 """
 
@@ skipping 35 matching lines @@
 expect = """\
 Hello from program.c
 Hello from make-prog1.py
 Hello from make-prog2.py
 """
 
 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 change the generator's
behaviour to avoid needing to? I thought I had made the generator produce all
executables to <(PRODUCT_DIR) to make it easy to run them.

[jbudorick, 2014/06/11 16:30:22]

I'm not sure if we can change how the generator decides the android_module or
not. At a glance, it appeared to me as though we may be locked in to the current
way because of our use of local-intermediates-dir and intermediates-dir-for from
android's build system. I did figure that doing so is probably beyond the scope
of this CL.

If you think that changing the generator is the correct way to go, I can remove
all of the subdir params I've added. Doing so will cause these tests to fail,
though.

As far as I can tell, executables go to the intermediate dir like everything
else.

[Torne, 2014/06/11 16:41:39]

I don't understand what the subdir parameter here is doing in the first place,
or how that's related to the android intermediate dirs, I mean.
Having to special case every test that happens to use this mechanism seems
really gross, yes. We should avoid this.
Sorry, I checked and the generator currently only copies *host* executables to
<(PRODUCT_DIR) (so that they can be used by other build rules). We've never
really cared about building target executables before, so they don't have any
special handling.

+else:
+  test.run_built_executable('program', chdir=chdir, stdout=expect)
 
 
 test.must_match('relocate/src/subdir2/file.out', "Hello from make-file.py\n")
 
 
 expect = "Hello from generate_main.py\n"
 
 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.
 def clean_dep_files():
   for file in (glob.glob('relocate/src/dep_*.txt') +
                glob.glob('relocate/src/deps_all_done_*.txt')):
     if os.path.exists(file):
       os.remove(file)
 
 # Confirm our clean.
@@ skipping 14 matching lines @@
 # previous tests deleted.  Confirm this execution did NOT run the ALL
 # target which would mess up our dep tests.
 clean_dep_files()
 test.build('actions.gyp', 'action_with_dependencies_321', chdir='relocate/src',
            arguments=arguments)
 test.must_exist('relocate/src/deps_all_done_first_321.txt')
 test.must_not_exist('relocate/src/deps_all_done_first_123.txt')
 
 
 test.pass_test()