[recipe_modules/test_result] Support uploading full json results format for upload_test_results.py

scripts/slave/recipe_modules/test_results/resources/upload_test_results.py

 #!/usr/bin/env python
 # Copyright (c) 2015 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.
 
 """See README.md for usage instructions.
 
 This file heavily modified from build/scripts/slave/gtest_slave_utils.py and
 is intended to replace it as all tests move to swarming.
 TODO(estaab): Remove build/scripts/slave/gtest.* once this is fully deployed.
@@ skipping 117 matching lines @@
     return 1
 
   if options.test_results_server and not options.master_name:
     logging.warn('--test-results-server is given but '
                  '--master-name is not specified; the results won\'t be '
                  'uploaded to the server.')
 
   with file(options.input_json) as json_file:
     results_json = json_file.read()
 
-  files = generate_json_results_file(
-      results_json, builder_name=options.builder_name,
-      build_number=options.build_number,
-      results_directory=options.results_directory,
-      chrome_revision=options.chrome_revision,
-      master_name=options.master_name)
+  content = json.loads(results_json)
+  if content.get('version', 0) >= 3:
+    print 'Input JSON file probably has full json results format'
+    files = [(os.path.basename(options.input_json), options.input_json)]
+  else:
+    print ('Input JSON file probably has gtest format. Converting to full json'
+           ' results format')
+    files = generate_json_results_file(
+        results_json, builder_name=options.builder_name,
+        build_number=options.build_number,
+        results_directory=options.results_directory,
+        chrome_revision=options.chrome_revision,
+        master_name=options.master_name)
 
   # Upload to a test results server if specified.
   if options.test_results_server and options.master_name:
     print 'Uploading JSON files for builder "%s" to server "%s"' % (
         options.builder_name, options.test_results_server)
     attrs = [('builder', options.builder_name),
              ('testtype', options.test_type),
              ('master', options.master_name)]
 
     # Set uploading timeout in case appengine server is having problem.
     # 120 seconds are more than enough to upload test results.
     test_results_uploader.upload_test_results(
         options.test_results_server, attrs, files, 120)
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))