Changeset 41760 in webkit

Timestamp:

Mar 17, 2009 2:15:29 AM (15 years ago)

Author:

oliver@apple.com

Message:

Fix coverage builds

Reviewed by Alexey Proskuryakov

Make coverage testing more reliable by ensuring --coverage does not
clobber configuration settings, and by removing the unnecessary
dependency on matplotlib.

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• CodeCoverage/regenerate-coverage-display (modified) (8 diffs)
• Scripts/webkitdirs.pm (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-03-17  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Make coverage testing more reliable by ensuring --coverage does not
+        clobber configuration settings, and by removing the unnecessary 
+        dependency on matplotlib.
+
+        * CodeCoverage/regenerate-coverage-display:
+        * Scripts/webkitdirs.pm:
+
 2009-03-16  Anders Carlsson  <andersca@apple.com>
 

trunk/WebKitTools/CodeCoverage/regenerate-coverage-display

@@ -54 +54 @@
                                            "freefont",
                                            "msttcorefonts"])
-import matplotlib
-matplotlib.use("Agg")
-import matplotlib.pylab as m
 
 level_LOW    = 10
@@ -194 +191 @@
     </center>""")
 
-def write_title_page(dest_dir,plot_files, last_time, last_tot_lines, last_tot_covered, dir_series):
+def write_title_page(dest_dir, last_time, last_tot_lines, last_tot_covered, dir_series):
     """
     Write the index.html with a overview of each directory
@@ -212 +209 @@
     index.close()
 
-def write_directory_site(dest_dir, plot_files, dir_name, last_time, dir_series, file_series):
+def write_directory_site(dest_dir, dir_name, last_time, dir_series, file_series):
     escaped_dir = dir_name.replace(os.path.sep,'__')
     site = create_page(dest_dir, "%s.html" % escaped_dir)
@@ -229 +226 @@
     site.close()
 
-def write_file_site(dest_dir, plot_files, file_name, last_time, data_dir, last_id, file_series):
+def write_file_site(dest_dir, file_name, last_time, data_dir, last_id, file_series):
     escaped_name = file_name.replace(os.path.sep,'__')
     site = create_page(dest_dir, "%s.html" % escaped_name)
@@ -303 +300 @@
     times = [sample[0] for sample in data]
     times = [datetime.datetime.utcfromtimestamp(t) for t in times]
-    times = m.date2num(times)
+
     all_files = {}
     all_dirs  = {}
@@ -333 +330 @@
         os.makedirs(imgdir)
 
-    # Now plot the actual graphs
-    plot_files = {}
-    #plot_files["Total"] = plot_coverage(times, total_series, imgdir, "Total")
-    #for dir, series in dir_serieses.items():
-    #    plot_files[dir] = plot_coverage(times, map(lambda (a,b,c,d):(b,c), series), imgdir, dir)
-    #for f, series in file_serieses.items():
-    #    plot_files[f] = plot_coverage(times, series, imgdir, f)
 
     # And look up the latest revision id, and coverage information
@@ -346 +336 @@
     # Now start generating our html file
     copy_files(outdir)
-    write_title_page(outdir, plot_files, last_time, last_tot_lines, last_tot_covered, dir_serieses)
+    write_title_page(outdir, last_time, last_tot_lines, last_tot_covered, dir_serieses)
 
     dir_keys = dir_serieses.keys()
     dir_keys.sort()
     for dir_name in dir_keys:
-        write_directory_site(outdir, plot_files, dir_name, last_time, dir_serieses, file_serieses)
+        write_directory_site(outdir, dir_name, last_time, dir_serieses, file_serieses)
 
     file_keys = file_serieses.keys()
     for file_name in file_keys:
-        write_file_site(outdir, plot_files, file_name, last_time, datadir, last_id, file_serieses)
+        write_file_site(outdir, file_name, last_time, datadir, last_id, file_serieses)
 
 def read_csv(path):
@@ -388 +378 @@
     return [time, id, grand_total_lines, grand_covered_lines, per_file, per_dir]
 
-
-def plot_coverage(times, series, imgdir, name):
-    percentages = [cov * 100.0 / (tot or 1) for tot, cov in series]
-    m.plot_date(times, percentages, "b-")
-    m.plot_date(times, percentages, "bo")
-    m.title(name)
-    m.ylim(0, 100)
-    m.xlabel("Date")
-    m.ylabel("Statement Coverage (%)")
-    outfile_base = name.replace("/", "__") + ".png"
-    outfile = os.path.join(imgdir, outfile_base)
-    m.savefig(outfile, dpi=75)
-    m.close()
-    return outfile_base
-
-
 if __name__ == "__main__":
     import sys

trunk/WebKitTools/Scripts/webkitdirs.pm

@@ -310 +310 @@
     push @coverageSupportOptions, "GCC_GENERATE_TEST_COVERAGE_FILES=YES";
     push @coverageSupportOptions, "GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES";
-    push @coverageSupportOptions, "EXTRA_LINK= -ftest-coverage -fprofile-arcs";
-    push @coverageSupportOptions, "OTHER_CFLAGS= -MD";
+    push @coverageSupportOptions, "EXTRA_LINK= \$(EXTRA_LINK) -ftest-coverage -fprofile-arcs";
+    push @coverageSupportOptions, "OTHER_CFLAGS= \$(OTHER_CFLAGS) -MD";
     push @coverageSupportOptions, "OTHER_LDFLAGS=\$(OTHER_LDFLAGS) -ftest-coverage -fprofile-arcs -framework AppKit";
     return @coverageSupportOptions;