Improve cr_cronet.py - pass unknown options to test runner and debugger

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
@@ skipping 10 matching lines @@
                       choices=['gyp',
                                'sync',
                                'build',
                                'install',
                                'proguard',
                                'test',
                                'debug'])
   parser.add_argument('-r', '--release', action='store_true',
                       help='use release configuration')
 
-  options = parser.parse_args()
+  options, unknown_options = parser.parse_known_args()
   print options
+  print unknown_options
   gyp_defines = 'GYP_DEFINES="OS=android enable_websockets=0 '+ \
       'disable_file_support=1 disable_ftp_support=1 '+ \
       'use_icu_alternatives_on_android=1" '
   out_dir = 'out/Debug'
   release_arg = ''
   if options.release:
     out_dir = 'out/Release'
     release_arg = ' --release'
 
   if (options.command=='gyp'):
     return run (gyp_defines + ' gclient runhooks')
   if (options.command=='sync'):
     return run ('git pull --rebase && ' + gyp_defines + ' gclient sync')
   if (options.command=='build'):
     return run ('ninja -C ' + out_dir + ' cronet_test_instrumentation_apk')
   if (options.command=='install'):
     return run ('build/android/adb_install_apk.py ' + release_arg + \

[xunjieli, 2014/09/25 21:37:34]

We probably don't want the release_arg here. Right now, it gives me "Abort
message: '[0925/173436:FATAL:jni_android.cc(158)] Check failed:
!ClearException(env) && clazz. Failed to find class
org/chromium/cronet_test_apk/MockUrlRequestJobTest". I am guessing that the
release_arg strips off that MockUrlRequestJobTest class that I have just added.

[xunjieli, 2014/09/29 16:03:04]

Remove "release_arg"?

[mef, 2014/09/29 17:17:56]

Why? I think it is useful to be able to build/install/test both release and
debug versions.

[xunjieli, 2014/09/29 17:37:42]

I see. I misunderstood the intention of this variable. It becomes clear after
reading the earlier code.

                 ' --apk=CronetTest.apk')
   if (options.command=='proguard'):
     return run ('ninja -C ' + out_dir + ' cronet_sample_proguard_apk')
   if (options.command=='test'):
     return run ('build/android/test_runner.py instrumentation '+ \
-                release_arg + ' --test-apk=CronetTestInstrumentation')
+                release_arg + ' --test-apk=CronetTestInstrumentation ' + \
+                ' '.join(unknown_options))
+  if (options.command=='debug'):
+    return run ('build/android/adb_gdb --start ' + \
+                '--activity=.CronetTestActivity ' + \

[xunjieli, 2014/09/25 17:54:36]

From what I understand, adb_gdb script binds a gdb server to a running activity.
Currently once CronetTestActivity starts, there are no interactive elements (eg.
buttons), but just an empty screen. So there is no way to trigger a break point
if there is one. But I guess we can add something to the app later. So this
debug option is not very meaningful right now, right? If I miss anything, please
let me know. I'd really like to know how to better debug on cronet :)

+                '--program-name=CronetTest ' + \
+                '--package-name=org.chromium.cronet_test_apk ' + \
+                ' '.join(unknown_options))
 
   parser.print_help()
   return 1
 
 
 if __name__ == '__main__':
   sys.exit(main())