[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

Index: scripts/slave/recipe_modules/test_results/resources/upload_test_results.py
diff --git a/scripts/slave/recipe_modules/test_results/resources/upload_test_results.py b/scripts/slave/recipe_modules/test_results/resources/upload_test_results.py
index 7a9d3d55576fb23039a2121a59ff4a6510c0be89..332acd875b7e139c020c63035702ca70b296fb72 100755
--- a/scripts/slave/recipe_modules/test_results/resources/upload_test_results.py
+++ b/scripts/slave/recipe_modules/test_results/resources/upload_test_results.py
@@ -135,12 +135,19 @@ def main(args):
   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') == 3:

[estaab, 2016/11/07 00:13:21]

maybe >=3? This seems brittle since later versions will likely retain backward
compatibility.

[nednguyen, 2016/11/07 14:26:24]

Done.

+    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: