diff options
author | Jackie Huang <jackie.huang@windriver.com> | 2014-08-19 05:16:16 -0400 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-08-21 21:35:08 +0200 |
commit | fca294b76eb2477fb23bf412b2188fdbffad6629 (patch) | |
tree | 1d14915edae041c847e1dc180ca452a9dbe3cc26 /meta-oe/recipes-benchmark | |
parent | ff134012611bc9f93237e4a4372b87c3ceaaf1a3 (diff) | |
download | meta-openembedded-contrib-fca294b76eb2477fb23bf412b2188fdbffad6629.tar.gz |
lmbench: Fix "make html" graph failure
The html-list perl script cannot parse the first line of the result
files about the lmbench version.
Additional fixes are to make the result's html pages easier to understand.
Signed-off-by: Lin Yu <lin.yu@windriver.com>
Signed-off-by: Fupan Li <fupan.li@windriver.com>
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-benchmark')
-rw-r--r-- | meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/lmbench_result_html_report.patch | 61 | ||||
-rw-r--r-- | meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb | 5 |
2 files changed, 64 insertions, 2 deletions
diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/lmbench_result_html_report.patch b/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/lmbench_result_html_report.patch new file mode 100644 index 0000000000..cda2f0c6d1 --- /dev/null +++ b/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/lmbench_result_html_report.patch @@ -0,0 +1,61 @@ +lmbench: Fix "make html" graph failure + +The html-list perl script cannot parse the first line of the result +files about the lmbench version. + +Additional fixes are to make the result's html pages easier to understand. + +Signed-off-by: Lin Yu <lin.yu@windriver.com> +Signed-off-by: Fupan Li <fupan.li@windriver.com> + +Reworded patch description. + +Upstream-status: inappropriate [ configuration ] + +Signed-off-by: Mark Hatle <mark.hatle@windriver.com> + +diff --git a/results/Makefile b/results/Makefile +index 0935376..1ef9a15 100644 +--- a/results/Makefile ++++ b/results/Makefile +@@ -186,6 +186,7 @@ paper: + # scratch makes you want a Ghz machine. + html: dirs + -make clean ++ make ps + #$(SCRIPTS)bghtml $(BG) + $(SCRIPTS)html-list $(LIST) + $(MK) LIST="$(LIST)" summary > HTML/summary.out 2> HTML/summary.errs +diff --git a/scripts/html-list b/scripts/html-list +index 9850461..6383115 100755 +--- a/scripts/html-list ++++ b/scripts/html-list +@@ -14,7 +14,7 @@ open(H, ">HTML/specific.html"); + print H <<EOF; + <title>LMBENCH System Results</title> + <h1>LMBENCH System Results</h1> +-<h2><a href=summary>Summary of results</a></h2> ++<h2><a href=summary.out>Summary of results</a></h2> + <hr> + EOF + +@@ -47,7 +47,7 @@ foreach $os (@os) { + open(F, $file); + $_ = <F>; + close(F); +- next unless /lmbench1.[01]/; ++ next unless /lmbench[0-9]+.[01]/; + chop; + $title = $_; + #s/.lmbench1.? results for //; +@@ -103,10 +103,7 @@ EOF + if $i < $#os; + print S<<EOF; + <h4>$title</h4> +-<a href=../$doc{$what}>Information on this benchmark</a> (Not up to date) + <p><IMG SRC="${what}${scale}$N.gif">\n<p> +-<a href=../lmbench.html> +-<img align=middle src="../gifs/arrows/b_arrow.gif">LMBENCH table of contents</a> + <a href=specific.html> + <img align=middle src=\"../gifs/graph.gif\">System results table of contents</a> + <p> diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb b/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb index 41db15000e..d8238ae4b5 100644 --- a/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb +++ b/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb @@ -14,8 +14,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/lmbench/lmbench-${PV}.tgz \ file://rename-line-binary.patch \ file://update-results-script.patch \ file://obey-ranlib.patch \ - file://update-config-script.patch \ - file://use-base_libdir-instead-of-hardcoded-lib.patch \ + file://update-config-script.patch \ + file://use-base_libdir-instead-of-hardcoded-lib.patch \ + file://lmbench_result_html_report.patch \ " SRC_URI[md5sum] = "b3351a3294db66a72e2864a199d37cbf" SRC_URI[sha256sum] = "cbd5777d15f44eab7666dcac418054c3c09df99826961a397d9acf43d8a2a551" |