[Cronet] Don't forget EmbeddedTestServer apk when testing with cr_cronet.py

components/cronet/tools/cr_cronet.py

 #!/usr/bin/python
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """
 cr_cronet.py - cr - like helper tool for cronet developers
 """
 
 import argparse
 import os
 import sys
 
 
 def run(command, extra_options=''):
   command = command + ' ' + extra_options
   print command
   return os.system(command)
 
 
 def build(out_dir, extra_options=''):
   return run('ninja -C ' + out_dir + ' cronet_test_instrumentation_apk',
              extra_options)
 
 
 def install(release_arg):
   return run('build/android/adb_install_apk.py ' + release_arg + \
-             ' --apk=CronetTest.apk')
+             ' --apk=CronetTest.apk') or \

[xunjieli, 2016/04/06 13:10:04]

I don't really know Python. Should this be "and" instead of "or' ? Does Python
evaluate both even though first run returns true?

[pauljensen, 2016/04/06 13:12:53]

run() returns the return code, so 0 is success, so we want to stop when either
returns non-zero.  "or" in Python is short-circuting, so if the first one
returns non-zero it will not run the second one, which is the desire behavior.

http://stackoverflow.com/questions/2580136/does-python-support-short-circuiting

[xunjieli, 2016/04/06 13:14:37]

Ah, that makes sense. Thanks.

+             run('build/android/adb_install_apk.py ' + release_arg + \
+             ' --apk=ChromiumNetTestSupport.apk')
 
 
 def test(release_arg, extra_options):
   return run('build/android/test_runner.py instrumentation '+ \
              release_arg + ' --test-apk=CronetTestInstrumentation' + \
              ' --fast-local-dev',
              extra_options)
 
 
 def debug(extra_options):
@@ skipping 66 matching lines @@
     return install(release_arg) or debug(extra_options)
   if (options.command=='build-debug'):
     return build(out_dir) or install(release_arg) or debug(extra_options)
 
   parser.print_help()
   return 1
 
 
 if __name__ == '__main__':
   sys.exit(main())