🏆 Allow Android test wrapper scripts to specify their timeouts in GN/GYP

net/net.gyp

 # Copyright 2013 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.
 
 {
   'variables': {
     'chromium_code': 1,
     'linux_link_kerberos%': 0,
     'conditions': [
       ['chromeos==1 or embedded==1 or OS=="ios"', {
@@ skipping 1563 matching lines @@
                 'clear': 1,
               },
               'includes': ['../build/android/copy_ex.gypi'],
             }],
           ],
           'variables': {
             'test_suite_name': 'net_unittests',
             'isolate_file': 'net_unittests.isolate',
             'android_manifest_path': 'android/unittest_support/AndroidManifest.xml',
             'resource_dir': 'android/unittest_support/res',
+            'shard_timeout': 300,

[xunjieli, 2016/04/12 02:13:17]

Are these numbers same as what we have on all the bots?

[xunjieli, 2016/04/12 02:18:51]

where does "300" come from? Why does cronet_unittests has timeout as 180
instead?

[agrieve, 2016/04/12 02:33:37]

Good question.

Cronet & net are run here with a timeout of 180:
https://code.google.com/p/chromium/codesearch#chromium/build/scripts/slave/re...

But net is run here with a timeout of 300:
https://code.google.com/p/chromium/codesearch#chromium/build/scripts/slave/re...

So I used the bigger of the two (not positive that's the correct thing to do)

[xunjieli, 2016/04/12 02:40:28]

I see. I remembered there was some issue with timeouts (Some net unittests take
more than 100s. See crbug.com/540939). Since these timeout values are current
ones, so I think this will be fine.

             'conditions': [
               ['v8_use_external_startup_data==1', {
                 'asset_location': '<(PRODUCT_DIR)/net_unittests_apk/assets',
                 'additional_input_paths': [
                   '<(PRODUCT_DIR)/net_unittests_apk/assets/natives_blob_<(arch_suffix).bin',
                   '<(PRODUCT_DIR)/net_unittests_apk/assets/snapshot_blob_<(arch_suffix).bin',
                 ],
               }],
             ],
           },
@@ skipping 104 matching lines @@
             '../build/isolate.gypi',
           ],
           'sources': [
             'net_unittests.isolate',
           ],
         },
       ],
     }],
   ],
 }