Bug 1417280 - Don't include intermediate folders in grcov ZIP file. r=jmaher

--HG--
extra : rebase_source : 272d72cc24f7075e693a447d4937af6e13b75104

testing/mozharness/mozharness/mozilla/testing/codecoverage.py

@@ -182,20 +182,18 @@ class CodeCoverageMixin(object):
 
             # 'grcov_output' will be a tuple, the first variable is the path to the lcov output,
             # the other is the path to the standard error output.
-            grcov_output = self.get_output_from_command(
+            grcov_output, _ = self.get_output_from_command(
                 grcov_command,
-                cwd=self.grcov_dir,
                 silent=True,
-                tmpfile_base_path=os.path.join(self.grcov_dir, 'grcov_lcov_output'),
                 save_tmpfiles=True,
                 return_type='files'
             )
-            new_output_name = grcov_output[0] + '.info'
-            os.rename(grcov_output[0], new_output_name)
+            output_file_name = 'grcov_lcov_output.info'
+            os.rename(grcov_output, os.path.join(self.grcov_dir, output_file_name))
 
             # Zip the grcov output and upload it.
             self.run_command(
-                ['zip', os.path.join(dirs['abs_blob_upload_dir'], 'code-coverage-grcov.zip'), new_output_name],
+                ['zip', os.path.join(dirs['abs_blob_upload_dir'], 'code-coverage-grcov.zip'), output_file_name],
                 cwd=self.grcov_dir
             )