Merge lp:~patrick-crews/drizzle-automation/drizzle-automation-lcov17 into lp:drizzle-automation

[Patrick Crews]

[Patrick Crews (patrick-crews)]

Added changes to drizzle/automation/lcov/run.py (starting ~line 280) that will add a flag to the genhtml call to add function-level coverage to the generated html reports. Will run as usual otherwise.

[Jay Pipes (jaypipes)]

Sweet. Merging in now.

review: Approve

=== modified file 'drizzle/automation/lcov/run.py'
--- drizzle/automation/lcov/run.py	2010-01-14 17:33:28 +0000
+++ drizzle/automation/lcov/run.py	2010-01-14 21:55:17 +0000
@@ -277,7 +277,17 @@
   # Produce HTML coverage reports
   logging.info("Producing LCOV HTML coverage reports.")
 
-  (retcode, output)= commands.getstatusoutput("genhtml -o %s %s" % (output_dir, output_file))
+  # Check lcov version.  If it is >= 1.7, we want to have function-level coverage
+  # We do a quick check of the version number
+  # At the time of this code, lcov verno output is of the form: lcov: LCOV version 1.7 
+  lcov_version = float(commands.getoutput("lcov --version").split()[-1])
+  if lcov_version >= 1.7:
+    function_string = "--function-coverage" 
+  else:
+    function_string = ""
+  genhtml_cmd = "genhtml %s -o %s %s" %(function_string, output_dir, output_file)
+
+  (retcode, output)= commands.getstatusoutput(genhtml_cmd)
   if not retcode == 0:
     logging.error("Failed to generate LCOV HTML coverage report. Got error %s after running %s" % (output, cmd))
     sys.exit(1)