diff --git a/tests/fork/hpc_fork.stdout b/tests/fork/hpc_fork.stdout index 14086d930d6f9908ef64c9de8806b0199ff2fe3c..26cd7e9c0f277e2e605a090d0e14eb71435a9bc5 100644 --- a/tests/fork/hpc_fork.stdout +++ b/tests/fork/hpc_fork.stdout @@ -23,7 +23,10 @@ Writing: Main.hs.html -<html><style type="text/css"> +<html> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> +<style type="text/css"> span.lineno { color: white; background: #aaaaaa; border-right: solid white 12px } span.nottickedoff { background: yellow} span.istickedoff { background: white } @@ -33,6 +36,8 @@ span.funcount { font-size: small; color: orange; z-index: 2; position: absolute; span.decl { font-weight: bold } span.spaces { background: white } </style> +</head> +<body> <pre> <span class="lineno"> 1 </span>module Main where <span class="lineno"> 2 </span> @@ -46,70 +51,71 @@ span.spaces { background: white } <span class="lineno"> 10 </span> </pre> +</body> </html> Writing: hpc_index.html -<html><style type="text/css">table.bar { background-color: #f25913; } +<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><style type="text/css">table.bar { background-color: #f25913; } td.bar { background-color: #60de51; } td.invbar { background-color: #f25913; } table.dashboard { border-collapse: collapse ; border: solid 1px black } .dashboard td { border: solid 1px black } .dashboard th { border: solid 1px black } </style> -<table class="dashboard" width="100%" border=1> +</head><body><table class="dashboard" width="100%" border=1> <tr><th rowspan=2><a href="hpc_index.html">module</a></th><th colspan=3><a href="hpc_index_fun.html">Top Level Definitions</a></th><th colspan=3><a href="hpc_index_alt.html">Alternatives</a></th><th colspan=3><a href="hpc_index_exp.html">Expressions</a></th></tr><tr><th>%</th><th colspan=2>covered / total</th><th>%</th><th colspan=2>covered / total</th><th>%</th><th colspan=2>covered / total</th></tr><tr> <td> <tt>module <a href="Main.hs.html">Main</a></tt></td> <td align="right">100%</td><td>1/1</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="100%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">- </td><td>0/0</td><td width=100> </td><td align="right">53%</td><td>7/13</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="53%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr> <tr></tr><tr style="background: #e0e0e0"> <th align=left> Program Coverage Total</tt></th> <td align="right">100%</td><td>1/1</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="100%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">- </td><td>0/0</td><td width=100> </td><td align="right">53%</td><td>7/13</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="53%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr> -</table></html> +</table></body></html> Writing: hpc_index_fun.html -<html><style type="text/css">table.bar { background-color: #f25913; } +<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><style type="text/css">table.bar { background-color: #f25913; } td.bar { background-color: #60de51; } td.invbar { background-color: #f25913; } table.dashboard { border-collapse: collapse ; border: solid 1px black } .dashboard td { border: solid 1px black } .dashboard th { border: solid 1px black } </style> -<table class="dashboard" width="100%" border=1> +</head><body><table class="dashboard" width="100%" border=1> <tr><th rowspan=2><a href="hpc_index.html">module</a></th><th colspan=3><a href="hpc_index_fun.html">Top Level Definitions</a></th><th colspan=3><a href="hpc_index_alt.html">Alternatives</a></th><th colspan=3><a href="hpc_index_exp.html">Expressions</a></th></tr><tr><th>%</th><th colspan=2>covered / total</th><th>%</th><th colspan=2>covered / total</th><th>%</th><th colspan=2>covered / total</th></tr><tr> <td> <tt>module <a href="Main.hs.html">Main</a></tt></td> <td align="right">100%</td><td>1/1</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="100%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">- </td><td>0/0</td><td width=100> </td><td align="right">53%</td><td>7/13</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="53%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr> <tr></tr><tr style="background: #e0e0e0"> <th align=left> Program Coverage Total</tt></th> <td align="right">100%</td><td>1/1</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="100%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">- </td><td>0/0</td><td width=100> </td><td align="right">53%</td><td>7/13</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="53%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr> -</table></html> +</table></body></html> Writing: hpc_index_alt.html -<html><style type="text/css">table.bar { background-color: #f25913; } +<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><style type="text/css">table.bar { background-color: #f25913; } td.bar { background-color: #60de51; } td.invbar { background-color: #f25913; } table.dashboard { border-collapse: collapse ; border: solid 1px black } .dashboard td { border: solid 1px black } .dashboard th { border: solid 1px black } </style> -<table class="dashboard" width="100%" border=1> +</head><body><table class="dashboard" width="100%" border=1> <tr><th rowspan=2><a href="hpc_index.html">module</a></th><th colspan=3><a href="hpc_index_fun.html">Top Level Definitions</a></th><th colspan=3><a href="hpc_index_alt.html">Alternatives</a></th><th colspan=3><a href="hpc_index_exp.html">Expressions</a></th></tr><tr><th>%</th><th colspan=2>covered / total</th><th>%</th><th colspan=2>covered / total</th><th>%</th><th colspan=2>covered / total</th></tr><tr> <td> <tt>module <a href="Main.hs.html">Main</a></tt></td> <td align="right">100%</td><td>1/1</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="100%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">- </td><td>0/0</td><td width=100> </td><td align="right">53%</td><td>7/13</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="53%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr> <tr></tr><tr style="background: #e0e0e0"> <th align=left> Program Coverage Total</tt></th> <td align="right">100%</td><td>1/1</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="100%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">- </td><td>0/0</td><td width=100> </td><td align="right">53%</td><td>7/13</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="53%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr> -</table></html> +</table></body></html> Writing: hpc_index_exp.html -<html><style type="text/css">table.bar { background-color: #f25913; } +<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><style type="text/css">table.bar { background-color: #f25913; } td.bar { background-color: #60de51; } td.invbar { background-color: #f25913; } table.dashboard { border-collapse: collapse ; border: solid 1px black } .dashboard td { border: solid 1px black } .dashboard th { border: solid 1px black } </style> -<table class="dashboard" width="100%" border=1> +</head><body><table class="dashboard" width="100%" border=1> <tr><th rowspan=2><a href="hpc_index.html">module</a></th><th colspan=3><a href="hpc_index_fun.html">Top Level Definitions</a></th><th colspan=3><a href="hpc_index_alt.html">Alternatives</a></th><th colspan=3><a href="hpc_index_exp.html">Expressions</a></th></tr><tr><th>%</th><th colspan=2>covered / total</th><th>%</th><th colspan=2>covered / total</th><th>%</th><th colspan=2>covered / total</th></tr><tr> <td> <tt>module <a href="Main.hs.html">Main</a></tt></td> <td align="right">100%</td><td>1/1</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="100%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">- </td><td>0/0</td><td width=100> </td><td align="right">53%</td><td>7/13</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="53%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr> <tr></tr><tr style="background: #e0e0e0"> <th align=left> Program Coverage Total</tt></th> <td align="right">100%</td><td>1/1</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="100%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">- </td><td>0/0</td><td width=100> </td><td align="right">53%</td><td>7/13</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="53%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr> -</table></html> +</table></body></html> diff --git a/tests/function/subdir/tough2.stdout b/tests/function/subdir/tough2.stdout index b84093298e36ce5d3856e0143d1d584152aefb9a..2594091e5b613077162332692e60901bfdf84988 100644 --- a/tests/function/subdir/tough2.stdout +++ b/tests/function/subdir/tough2.stdout @@ -1,160 +1,166 @@ -"Hello" -"Hello" -badCase -badCase -"Bark" -"Hello" -(1,2,3) - - - 71% expressions used (68/95) - 14% boolean coverage (1/7) - 0% guards (0/4), 3 always True, 1 always False - 33% 'if' conditions (1/3), 1 always True, 1 always False - 100% qualifiers (0/0) - 58% alternatives used (7/12) -100% local declarations used (0/0) - 83% top-level declarations used (5/6) - - ------<module Main>----- - 71% expressions used (68/95) - 14% boolean coverage (1/7) - 0% guards (0/4), 3 always True, 1 always False - 33% 'if' conditions (1/3), 1 always True, 1 always False - 100% qualifiers (0/0) - 58% alternatives used (7/12) -100% local declarations used (0/0) - 83% top-level declarations used (5/6) - - -Writing: Main.hs.html -<html><style type="text/css"> -span.lineno { color: white; background: #aaaaaa; border-right: solid white 12px } -span.nottickedoff { background: yellow} -span.istickedoff { background: white } -span.tickonlyfalse { margin: -1px; border: 1px solid #f20913; background: #f20913 } -span.tickonlytrue { margin: -1px; border: 1px solid #60de51; background: #60de51 } -span.funcount { font-size: small; color: orange; z-index: 2; position: absolute; right: 20 } -span.decl { font-weight: bold } -span.spaces { background: white } -</style> -<pre> -<span class="lineno"> 1 </span>\begin{code} -<span class="lineno"> 2 </span>import Control.Exception as E -<span class="lineno"> 3 </span> -<span class="lineno"> 4 </span>-- This test shows what hpc can really do. -<span class="lineno"> 5 </span> -<span class="lineno"> 6 </span><span class="decl"><span class="istickedoff">main = do</span> -<span class="lineno"> 7 </span><span class="spaces"> </span><span class="istickedoff">print ("Hello")</span> -<span class="lineno"> 8 </span><span class="spaces"> </span><span class="istickedoff">foo "Hello"</span> -<span class="lineno"> 9 </span><span class="spaces"> </span><span class="istickedoff">E.catch (print (badCase 22 <span class="nottickedoff">44</span>))</span> -<span class="lineno"> 10 </span><span class="spaces"> </span><span class="istickedoff">(\ e -> print (e :: E.ErrorCall))</span> -<span class="lineno"> 11 </span><span class="spaces"> </span><span class="istickedoff">E.catch (print (badCase 22 <span class="nottickedoff">(error "Foo")</span>))</span> -<span class="lineno"> 12 </span><span class="spaces"> </span><span class="istickedoff">(\ e -> print (e :: E.ErrorCall))</span> -<span class="lineno"> 13 </span><span class="spaces"> </span><span class="istickedoff">E.catch (print "Bark")</span> -<span class="lineno"> 14 </span><span class="spaces"> </span><span class="istickedoff"><span class="nottickedoff">(\ e -> print (e :: E.ErrorCall))</span></span> -<span class="lineno"> 15 </span><span class="spaces"> </span><span class="istickedoff">(_,_) <- return $ (<span class="nottickedoff">"Hello"</span>,<span class="nottickedoff">"World"</span>)</span> -<span class="lineno"> 16 </span><span class="spaces"> </span><span class="istickedoff">return <span class="nottickedoff">()</span></span> -<span class="lineno"> 17 </span><span class="spaces"> </span><span class="istickedoff">() <- return ()</span> -<span class="lineno"> 18 </span><span class="spaces"> </span><span class="istickedoff">t <- case <span class="nottickedoff">()</span> of</span> -<span class="lineno"> 19 </span><span class="spaces"> </span><span class="istickedoff">_ | <span class="tickonlytrue">otherwoz</span> -> return <span class="nottickedoff">"Hello"</span></span> -<span class="lineno"> 20 </span><span class="spaces"> </span><span class="istickedoff">_ -> <span class="nottickedoff">error "Bad Thing Happened"</span></span> -<span class="lineno"> 21 </span><span class="spaces"> </span><span class="istickedoff">t <- case <span class="nottickedoff">()</span> of</span> -<span class="lineno"> 22 </span><span class="spaces"> </span><span class="istickedoff">_ | <span class="tickonlytrue">otherwise</span> -> return <span class="nottickedoff">"Hello"</span></span> -<span class="lineno"> 23 </span><span class="spaces"> </span><span class="istickedoff">_ -> <span class="nottickedoff">error "Bad Thing Happened"</span></span> -<span class="lineno"> 24 </span><span class="spaces"> </span><span class="istickedoff">t <- case <span class="nottickedoff">()</span> of</span> -<span class="lineno"> 25 </span><span class="spaces"> </span><span class="istickedoff">_ | <span class="tickonlytrue">otherwise</span> </span> -<span class="lineno"> 26 </span><span class="spaces"> </span><span class="istickedoff">, <span class="tickonlyfalse">False</span> -> <span class="nottickedoff">error "Bad Thing Happened"</span></span> -<span class="lineno"> 27 </span><span class="spaces"> </span><span class="istickedoff">_ -> return "Hello"</span> -<span class="lineno"> 28 </span><span class="spaces"> </span><span class="istickedoff">print t</span> -<span class="lineno"> 29 </span><span class="spaces"> </span><span class="istickedoff">print foo2</span></span> -<span class="lineno"> 30 </span> -<span class="lineno"> 31 </span><span class="decl"><span class="istickedoff">foo x = do</span> -<span class="lineno"> 32 </span><span class="spaces"> </span><span class="istickedoff">print x</span> -<span class="lineno"> 33 </span><span class="spaces"> </span><span class="istickedoff">return <span class="nottickedoff">()</span></span></span> -<span class="lineno"> 34 </span> -<span class="lineno"> 35 </span><span class="decl"><span class="nottickedoff">unused_ a = a</span></span> -<span class="lineno"> 36 </span> -<span class="lineno"> 37 </span>badCase :: Int -> Int -> Int -<span class="lineno"> 38 </span><span class="decl"><span class="istickedoff">badCase a b = </span> -<span class="lineno"> 39 </span><span class="spaces"> </span><span class="istickedoff">if a > 100 </span> -<span class="lineno"> 40 </span><span class="spaces"> </span><span class="istickedoff">then error "badCase" </span> -<span class="lineno"> 41 </span><span class="spaces"> </span><span class="istickedoff">else if <span class="tickonlyfalse">a > 1000</span> </span> -<span class="lineno"> 42 </span><span class="spaces"> </span><span class="istickedoff">then <span class="nottickedoff">1</span> </span> -<span class="lineno"> 43 </span><span class="spaces"> </span><span class="istickedoff">else badCase (a + 1) <span class="nottickedoff">(b - 1)</span></span></span> -<span class="lineno"> 44 </span> -<span class="lineno"> 45 </span> -<span class="lineno"> 46 </span><span class="decl"><span class="istickedoff">foo2 = (1,2, if <span class="tickonlytrue">True</span> then 3 else <span class="nottickedoff">4</span>)</span></span> -<span class="lineno"> 47 </span> -<span class="lineno"> 48 </span><span class="decl"><span class="istickedoff">otherwoz = True</span></span> -<span class="lineno"> 49 </span>\end{code} - -</pre> -</html> -Writing: hpc_index.html -<html><style type="text/css">table.bar { background-color: #f25913; } -td.bar { background-color: #60de51; } -td.invbar { background-color: #f25913; } -table.dashboard { border-collapse: collapse ; border: solid 1px black } -.dashboard td { border: solid 1px black } -.dashboard th { border: solid 1px black } -</style> -<table class="dashboard" width="100%" border=1> -<tr><th rowspan=2><a href="hpc_index.html">module</a></th><th colspan=3><a href="hpc_index_fun.html">Top Level Definitions</a></th><th colspan=3><a href="hpc_index_alt.html">Alternatives</a></th><th colspan=3><a href="hpc_index_exp.html">Expressions</a></th></tr><tr><th>%</th><th colspan=2>covered / total</th><th>%</th><th colspan=2>covered / total</th><th>%</th><th colspan=2>covered / total</th></tr><tr> -<td> <tt>module <a href="Main.hs.html">Main</a></tt></td> -<td align="right">83%</td><td>5/6</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="83%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">58%</td><td>7/12</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="58%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">71%</td><td>68/95</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="71%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr> -<tr></tr><tr style="background: #e0e0e0"> -<th align=left> Program Coverage Total</tt></th> -<td align="right">83%</td><td>5/6</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="83%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">58%</td><td>7/12</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="58%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">71%</td><td>68/95</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="71%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr> -</table></html> -Writing: hpc_index_fun.html -<html><style type="text/css">table.bar { background-color: #f25913; } -td.bar { background-color: #60de51; } -td.invbar { background-color: #f25913; } -table.dashboard { border-collapse: collapse ; border: solid 1px black } -.dashboard td { border: solid 1px black } -.dashboard th { border: solid 1px black } -</style> -<table class="dashboard" width="100%" border=1> -<tr><th rowspan=2><a href="hpc_index.html">module</a></th><th colspan=3><a href="hpc_index_fun.html">Top Level Definitions</a></th><th colspan=3><a href="hpc_index_alt.html">Alternatives</a></th><th colspan=3><a href="hpc_index_exp.html">Expressions</a></th></tr><tr><th>%</th><th colspan=2>covered / total</th><th>%</th><th colspan=2>covered / total</th><th>%</th><th colspan=2>covered / total</th></tr><tr> -<td> <tt>module <a href="Main.hs.html">Main</a></tt></td> -<td align="right">83%</td><td>5/6</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="83%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">58%</td><td>7/12</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="58%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">71%</td><td>68/95</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="71%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr> -<tr></tr><tr style="background: #e0e0e0"> -<th align=left> Program Coverage Total</tt></th> -<td align="right">83%</td><td>5/6</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="83%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">58%</td><td>7/12</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="58%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">71%</td><td>68/95</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="71%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr> -</table></html> -Writing: hpc_index_alt.html -<html><style type="text/css">table.bar { background-color: #f25913; } -td.bar { background-color: #60de51; } -td.invbar { background-color: #f25913; } -table.dashboard { border-collapse: collapse ; border: solid 1px black } -.dashboard td { border: solid 1px black } -.dashboard th { border: solid 1px black } -</style> -<table class="dashboard" width="100%" border=1> -<tr><th rowspan=2><a href="hpc_index.html">module</a></th><th colspan=3><a href="hpc_index_fun.html">Top Level Definitions</a></th><th colspan=3><a href="hpc_index_alt.html">Alternatives</a></th><th colspan=3><a href="hpc_index_exp.html">Expressions</a></th></tr><tr><th>%</th><th colspan=2>covered / total</th><th>%</th><th colspan=2>covered / total</th><th>%</th><th colspan=2>covered / total</th></tr><tr> -<td> <tt>module <a href="Main.hs.html">Main</a></tt></td> -<td align="right">83%</td><td>5/6</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="83%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">58%</td><td>7/12</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="58%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">71%</td><td>68/95</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="71%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr> -<tr></tr><tr style="background: #e0e0e0"> -<th align=left> Program Coverage Total</tt></th> -<td align="right">83%</td><td>5/6</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="83%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">58%</td><td>7/12</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="58%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">71%</td><td>68/95</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="71%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr> -</table></html> -Writing: hpc_index_exp.html -<html><style type="text/css">table.bar { background-color: #f25913; } -td.bar { background-color: #60de51; } -td.invbar { background-color: #f25913; } -table.dashboard { border-collapse: collapse ; border: solid 1px black } -.dashboard td { border: solid 1px black } -.dashboard th { border: solid 1px black } -</style> -<table class="dashboard" width="100%" border=1> -<tr><th rowspan=2><a href="hpc_index.html">module</a></th><th colspan=3><a href="hpc_index_fun.html">Top Level Definitions</a></th><th colspan=3><a href="hpc_index_alt.html">Alternatives</a></th><th colspan=3><a href="hpc_index_exp.html">Expressions</a></th></tr><tr><th>%</th><th colspan=2>covered / total</th><th>%</th><th colspan=2>covered / total</th><th>%</th><th colspan=2>covered / total</th></tr><tr> -<td> <tt>module <a href="Main.hs.html">Main</a></tt></td> -<td align="right">83%</td><td>5/6</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="83%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">58%</td><td>7/12</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="58%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">71%</td><td>68/95</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="71%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr> -<tr></tr><tr style="background: #e0e0e0"> -<th align=left> Program Coverage Total</tt></th> -<td align="right">83%</td><td>5/6</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="83%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">58%</td><td>7/12</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="58%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">71%</td><td>68/95</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="71%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr> -</table></html> - - +"Hello" +"Hello" +badCase +badCase +"Bark" +"Hello" +(1,2,3) + + + 71% expressions used (68/95) + 14% boolean coverage (1/7) + 0% guards (0/4), 3 always True, 1 always False + 33% 'if' conditions (1/3), 1 always True, 1 always False + 100% qualifiers (0/0) + 58% alternatives used (7/12) +100% local declarations used (0/0) + 83% top-level declarations used (5/6) + + +-----<module Main>----- + 71% expressions used (68/95) + 14% boolean coverage (1/7) + 0% guards (0/4), 3 always True, 1 always False + 33% 'if' conditions (1/3), 1 always True, 1 always False + 100% qualifiers (0/0) + 58% alternatives used (7/12) +100% local declarations used (0/0) + 83% top-level declarations used (5/6) + + +Writing: Main.hs.html +<html> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> +<style type="text/css"> +span.lineno { color: white; background: #aaaaaa; border-right: solid white 12px } +span.nottickedoff { background: yellow} +span.istickedoff { background: white } +span.tickonlyfalse { margin: -1px; border: 1px solid #f20913; background: #f20913 } +span.tickonlytrue { margin: -1px; border: 1px solid #60de51; background: #60de51 } +span.funcount { font-size: small; color: orange; z-index: 2; position: absolute; right: 20 } +span.decl { font-weight: bold } +span.spaces { background: white } +</style> +</head> +<body> +<pre> +<span class="lineno"> 1 </span>\begin{code} +<span class="lineno"> 2 </span>import Control.Exception as E +<span class="lineno"> 3 </span> +<span class="lineno"> 4 </span>-- This test shows what hpc can really do. +<span class="lineno"> 5 </span> +<span class="lineno"> 6 </span><span class="decl"><span class="istickedoff">main = do</span> +<span class="lineno"> 7 </span><span class="spaces"> </span><span class="istickedoff">print ("Hello")</span> +<span class="lineno"> 8 </span><span class="spaces"> </span><span class="istickedoff">foo "Hello"</span> +<span class="lineno"> 9 </span><span class="spaces"> </span><span class="istickedoff">E.catch (print (badCase 22 <span class="nottickedoff">44</span>))</span> +<span class="lineno"> 10 </span><span class="spaces"> </span><span class="istickedoff">(\ e -> print (e :: E.ErrorCall))</span> +<span class="lineno"> 11 </span><span class="spaces"> </span><span class="istickedoff">E.catch (print (badCase 22 <span class="nottickedoff">(error "Foo")</span>))</span> +<span class="lineno"> 12 </span><span class="spaces"> </span><span class="istickedoff">(\ e -> print (e :: E.ErrorCall))</span> +<span class="lineno"> 13 </span><span class="spaces"> </span><span class="istickedoff">E.catch (print "Bark")</span> +<span class="lineno"> 14 </span><span class="spaces"> </span><span class="istickedoff"><span class="nottickedoff">(\ e -> print (e :: E.ErrorCall))</span></span> +<span class="lineno"> 15 </span><span class="spaces"> </span><span class="istickedoff">(_,_) <- return $ (<span class="nottickedoff">"Hello"</span>,<span class="nottickedoff">"World"</span>)</span> +<span class="lineno"> 16 </span><span class="spaces"> </span><span class="istickedoff">return <span class="nottickedoff">()</span></span> +<span class="lineno"> 17 </span><span class="spaces"> </span><span class="istickedoff">() <- return ()</span> +<span class="lineno"> 18 </span><span class="spaces"> </span><span class="istickedoff">t <- case <span class="nottickedoff">()</span> of</span> +<span class="lineno"> 19 </span><span class="spaces"> </span><span class="istickedoff">_ | <span class="tickonlytrue">otherwoz</span> -> return <span class="nottickedoff">"Hello"</span></span> +<span class="lineno"> 20 </span><span class="spaces"> </span><span class="istickedoff">_ -> <span class="nottickedoff">error "Bad Thing Happened"</span></span> +<span class="lineno"> 21 </span><span class="spaces"> </span><span class="istickedoff">t <- case <span class="nottickedoff">()</span> of</span> +<span class="lineno"> 22 </span><span class="spaces"> </span><span class="istickedoff">_ | <span class="tickonlytrue">otherwise</span> -> return <span class="nottickedoff">"Hello"</span></span> +<span class="lineno"> 23 </span><span class="spaces"> </span><span class="istickedoff">_ -> <span class="nottickedoff">error "Bad Thing Happened"</span></span> +<span class="lineno"> 24 </span><span class="spaces"> </span><span class="istickedoff">t <- case <span class="nottickedoff">()</span> of</span> +<span class="lineno"> 25 </span><span class="spaces"> </span><span class="istickedoff">_ | <span class="tickonlytrue">otherwise</span> </span> +<span class="lineno"> 26 </span><span class="spaces"> </span><span class="istickedoff">, <span class="tickonlyfalse">False</span> -> <span class="nottickedoff">error "Bad Thing Happened"</span></span> +<span class="lineno"> 27 </span><span class="spaces"> </span><span class="istickedoff">_ -> return "Hello"</span> +<span class="lineno"> 28 </span><span class="spaces"> </span><span class="istickedoff">print t</span> +<span class="lineno"> 29 </span><span class="spaces"> </span><span class="istickedoff">print foo2</span></span> +<span class="lineno"> 30 </span> +<span class="lineno"> 31 </span><span class="decl"><span class="istickedoff">foo x = do</span> +<span class="lineno"> 32 </span><span class="spaces"> </span><span class="istickedoff">print x</span> +<span class="lineno"> 33 </span><span class="spaces"> </span><span class="istickedoff">return <span class="nottickedoff">()</span></span></span> +<span class="lineno"> 34 </span> +<span class="lineno"> 35 </span><span class="decl"><span class="nottickedoff">unused_ a = a</span></span> +<span class="lineno"> 36 </span> +<span class="lineno"> 37 </span>badCase :: Int -> Int -> Int +<span class="lineno"> 38 </span><span class="decl"><span class="istickedoff">badCase a b = </span> +<span class="lineno"> 39 </span><span class="spaces"> </span><span class="istickedoff">if a > 100 </span> +<span class="lineno"> 40 </span><span class="spaces"> </span><span class="istickedoff">then error "badCase" </span> +<span class="lineno"> 41 </span><span class="spaces"> </span><span class="istickedoff">else if <span class="tickonlyfalse">a > 1000</span> </span> +<span class="lineno"> 42 </span><span class="spaces"> </span><span class="istickedoff">then <span class="nottickedoff">1</span> </span> +<span class="lineno"> 43 </span><span class="spaces"> </span><span class="istickedoff">else badCase (a + 1) <span class="nottickedoff">(b - 1)</span></span></span> +<span class="lineno"> 44 </span> +<span class="lineno"> 45 </span> +<span class="lineno"> 46 </span><span class="decl"><span class="istickedoff">foo2 = (1,2, if <span class="tickonlytrue">True</span> then 3 else <span class="nottickedoff">4</span>)</span></span> +<span class="lineno"> 47 </span> +<span class="lineno"> 48 </span><span class="decl"><span class="istickedoff">otherwoz = True</span></span> +<span class="lineno"> 49 </span>\end{code} + +</pre> +</body> +</html> +Writing: hpc_index.html +<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><style type="text/css">table.bar { background-color: #f25913; } +td.bar { background-color: #60de51; } +td.invbar { background-color: #f25913; } +table.dashboard { border-collapse: collapse ; border: solid 1px black } +.dashboard td { border: solid 1px black } +.dashboard th { border: solid 1px black } +</style> +</head><body><table class="dashboard" width="100%" border=1> +<tr><th rowspan=2><a href="hpc_index.html">module</a></th><th colspan=3><a href="hpc_index_fun.html">Top Level Definitions</a></th><th colspan=3><a href="hpc_index_alt.html">Alternatives</a></th><th colspan=3><a href="hpc_index_exp.html">Expressions</a></th></tr><tr><th>%</th><th colspan=2>covered / total</th><th>%</th><th colspan=2>covered / total</th><th>%</th><th colspan=2>covered / total</th></tr><tr> +<td> <tt>module <a href="Main.hs.html">Main</a></tt></td> +<td align="right">83%</td><td>5/6</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="83%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">58%</td><td>7/12</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="58%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">71%</td><td>68/95</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="71%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr> +<tr></tr><tr style="background: #e0e0e0"> +<th align=left> Program Coverage Total</tt></th> +<td align="right">83%</td><td>5/6</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="83%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">58%</td><td>7/12</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="58%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">71%</td><td>68/95</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="71%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr> +</table></body></html> +Writing: hpc_index_fun.html +<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><style type="text/css">table.bar { background-color: #f25913; } +td.bar { background-color: #60de51; } +td.invbar { background-color: #f25913; } +table.dashboard { border-collapse: collapse ; border: solid 1px black } +.dashboard td { border: solid 1px black } +.dashboard th { border: solid 1px black } +</style> +</head><body><table class="dashboard" width="100%" border=1> +<tr><th rowspan=2><a href="hpc_index.html">module</a></th><th colspan=3><a href="hpc_index_fun.html">Top Level Definitions</a></th><th colspan=3><a href="hpc_index_alt.html">Alternatives</a></th><th colspan=3><a href="hpc_index_exp.html">Expressions</a></th></tr><tr><th>%</th><th colspan=2>covered / total</th><th>%</th><th colspan=2>covered / total</th><th>%</th><th colspan=2>covered / total</th></tr><tr> +<td> <tt>module <a href="Main.hs.html">Main</a></tt></td> +<td align="right">83%</td><td>5/6</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="83%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">58%</td><td>7/12</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="58%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">71%</td><td>68/95</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="71%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr> +<tr></tr><tr style="background: #e0e0e0"> +<th align=left> Program Coverage Total</tt></th> +<td align="right">83%</td><td>5/6</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="83%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">58%</td><td>7/12</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="58%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">71%</td><td>68/95</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="71%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr> +</table></body></html> +Writing: hpc_index_alt.html +<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><style type="text/css">table.bar { background-color: #f25913; } +td.bar { background-color: #60de51; } +td.invbar { background-color: #f25913; } +table.dashboard { border-collapse: collapse ; border: solid 1px black } +.dashboard td { border: solid 1px black } +.dashboard th { border: solid 1px black } +</style> +</head><body><table class="dashboard" width="100%" border=1> +<tr><th rowspan=2><a href="hpc_index.html">module</a></th><th colspan=3><a href="hpc_index_fun.html">Top Level Definitions</a></th><th colspan=3><a href="hpc_index_alt.html">Alternatives</a></th><th colspan=3><a href="hpc_index_exp.html">Expressions</a></th></tr><tr><th>%</th><th colspan=2>covered / total</th><th>%</th><th colspan=2>covered / total</th><th>%</th><th colspan=2>covered / total</th></tr><tr> +<td> <tt>module <a href="Main.hs.html">Main</a></tt></td> +<td align="right">83%</td><td>5/6</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="83%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">58%</td><td>7/12</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="58%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">71%</td><td>68/95</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="71%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr> +<tr></tr><tr style="background: #e0e0e0"> +<th align=left> Program Coverage Total</tt></th> +<td align="right">83%</td><td>5/6</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="83%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">58%</td><td>7/12</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="58%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">71%</td><td>68/95</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="71%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr> +</table></body></html> +Writing: hpc_index_exp.html +<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><style type="text/css">table.bar { background-color: #f25913; } +td.bar { background-color: #60de51; } +td.invbar { background-color: #f25913; } +table.dashboard { border-collapse: collapse ; border: solid 1px black } +.dashboard td { border: solid 1px black } +.dashboard th { border: solid 1px black } +</style> +</head><body><table class="dashboard" width="100%" border=1> +<tr><th rowspan=2><a href="hpc_index.html">module</a></th><th colspan=3><a href="hpc_index_fun.html">Top Level Definitions</a></th><th colspan=3><a href="hpc_index_alt.html">Alternatives</a></th><th colspan=3><a href="hpc_index_exp.html">Expressions</a></th></tr><tr><th>%</th><th colspan=2>covered / total</th><th>%</th><th colspan=2>covered / total</th><th>%</th><th colspan=2>covered / total</th></tr><tr> +<td> <tt>module <a href="Main.hs.html">Main</a></tt></td> +<td align="right">83%</td><td>5/6</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="83%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">58%</td><td>7/12</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="58%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">71%</td><td>68/95</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="71%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr> +<tr></tr><tr style="background: #e0e0e0"> +<th align=left> Program Coverage Total</tt></th> +<td align="right">83%</td><td>5/6</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="83%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">58%</td><td>7/12</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="58%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">71%</td><td>68/95</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="71%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr> +</table></body></html> + + diff --git a/tests/function/tough.stdout b/tests/function/tough.stdout index 06d918ed0f9969ef874a4f1424274a9477ea251c..aed0fd28b16d023fa21a3565150258c546705b8d 100644 --- a/tests/function/tough.stdout +++ b/tests/function/tough.stdout @@ -29,7 +29,10 @@ badCase Writing: Main.hs.html -<html><style type="text/css"> +<html> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> +<style type="text/css"> span.lineno { color: white; background: #aaaaaa; border-right: solid white 12px } span.nottickedoff { background: yellow} span.istickedoff { background: white } @@ -39,6 +42,8 @@ span.funcount { font-size: small; color: orange; z-index: 2; position: absolute; span.decl { font-weight: bold } span.spaces { background: white } </style> +</head> +<body> <pre> <span class="lineno"> 1 </span>import Control.Exception as E <span class="lineno"> 2 </span> @@ -89,70 +94,71 @@ span.spaces { background: white } <span class="lineno"> 47 </span><span class="decl"><span class="istickedoff">otherwoz = True</span></span> </pre> +</body> </html> Writing: hpc_index.html -<html><style type="text/css">table.bar { background-color: #f25913; } +<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><style type="text/css">table.bar { background-color: #f25913; } td.bar { background-color: #60de51; } td.invbar { background-color: #f25913; } table.dashboard { border-collapse: collapse ; border: solid 1px black } .dashboard td { border: solid 1px black } .dashboard th { border: solid 1px black } </style> -<table class="dashboard" width="100%" border=1> +</head><body><table class="dashboard" width="100%" border=1> <tr><th rowspan=2><a href="hpc_index.html">module</a></th><th colspan=3><a href="hpc_index_fun.html">Top Level Definitions</a></th><th colspan=3><a href="hpc_index_alt.html">Alternatives</a></th><th colspan=3><a href="hpc_index_exp.html">Expressions</a></th></tr><tr><th>%</th><th colspan=2>covered / total</th><th>%</th><th colspan=2>covered / total</th><th>%</th><th colspan=2>covered / total</th></tr><tr> <td> <tt>module <a href="Main.hs.html">Main</a></tt></td> <td align="right">83%</td><td>5/6</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="83%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">58%</td><td>7/12</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="58%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">71%</td><td>68/95</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="71%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr> <tr></tr><tr style="background: #e0e0e0"> <th align=left> Program Coverage Total</tt></th> <td align="right">83%</td><td>5/6</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="83%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">58%</td><td>7/12</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="58%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">71%</td><td>68/95</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="71%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr> -</table></html> +</table></body></html> Writing: hpc_index_fun.html -<html><style type="text/css">table.bar { background-color: #f25913; } +<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><style type="text/css">table.bar { background-color: #f25913; } td.bar { background-color: #60de51; } td.invbar { background-color: #f25913; } table.dashboard { border-collapse: collapse ; border: solid 1px black } .dashboard td { border: solid 1px black } .dashboard th { border: solid 1px black } </style> -<table class="dashboard" width="100%" border=1> +</head><body><table class="dashboard" width="100%" border=1> <tr><th rowspan=2><a href="hpc_index.html">module</a></th><th colspan=3><a href="hpc_index_fun.html">Top Level Definitions</a></th><th colspan=3><a href="hpc_index_alt.html">Alternatives</a></th><th colspan=3><a href="hpc_index_exp.html">Expressions</a></th></tr><tr><th>%</th><th colspan=2>covered / total</th><th>%</th><th colspan=2>covered / total</th><th>%</th><th colspan=2>covered / total</th></tr><tr> <td> <tt>module <a href="Main.hs.html">Main</a></tt></td> <td align="right">83%</td><td>5/6</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="83%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">58%</td><td>7/12</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="58%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">71%</td><td>68/95</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="71%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr> <tr></tr><tr style="background: #e0e0e0"> <th align=left> Program Coverage Total</tt></th> <td align="right">83%</td><td>5/6</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="83%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">58%</td><td>7/12</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="58%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">71%</td><td>68/95</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="71%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr> -</table></html> +</table></body></html> Writing: hpc_index_alt.html -<html><style type="text/css">table.bar { background-color: #f25913; } +<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><style type="text/css">table.bar { background-color: #f25913; } td.bar { background-color: #60de51; } td.invbar { background-color: #f25913; } table.dashboard { border-collapse: collapse ; border: solid 1px black } .dashboard td { border: solid 1px black } .dashboard th { border: solid 1px black } </style> -<table class="dashboard" width="100%" border=1> +</head><body><table class="dashboard" width="100%" border=1> <tr><th rowspan=2><a href="hpc_index.html">module</a></th><th colspan=3><a href="hpc_index_fun.html">Top Level Definitions</a></th><th colspan=3><a href="hpc_index_alt.html">Alternatives</a></th><th colspan=3><a href="hpc_index_exp.html">Expressions</a></th></tr><tr><th>%</th><th colspan=2>covered / total</th><th>%</th><th colspan=2>covered / total</th><th>%</th><th colspan=2>covered / total</th></tr><tr> <td> <tt>module <a href="Main.hs.html">Main</a></tt></td> <td align="right">83%</td><td>5/6</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="83%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">58%</td><td>7/12</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="58%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">71%</td><td>68/95</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="71%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr> <tr></tr><tr style="background: #e0e0e0"> <th align=left> Program Coverage Total</tt></th> <td align="right">83%</td><td>5/6</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="83%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">58%</td><td>7/12</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="58%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">71%</td><td>68/95</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="71%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr> -</table></html> +</table></body></html> Writing: hpc_index_exp.html -<html><style type="text/css">table.bar { background-color: #f25913; } +<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><style type="text/css">table.bar { background-color: #f25913; } td.bar { background-color: #60de51; } td.invbar { background-color: #f25913; } table.dashboard { border-collapse: collapse ; border: solid 1px black } .dashboard td { border: solid 1px black } .dashboard th { border: solid 1px black } </style> -<table class="dashboard" width="100%" border=1> +</head><body><table class="dashboard" width="100%" border=1> <tr><th rowspan=2><a href="hpc_index.html">module</a></th><th colspan=3><a href="hpc_index_fun.html">Top Level Definitions</a></th><th colspan=3><a href="hpc_index_alt.html">Alternatives</a></th><th colspan=3><a href="hpc_index_exp.html">Expressions</a></th></tr><tr><th>%</th><th colspan=2>covered / total</th><th>%</th><th colspan=2>covered / total</th><th>%</th><th colspan=2>covered / total</th></tr><tr> <td> <tt>module <a href="Main.hs.html">Main</a></tt></td> <td align="right">83%</td><td>5/6</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="83%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">58%</td><td>7/12</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="58%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">71%</td><td>68/95</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="71%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr> <tr></tr><tr style="background: #e0e0e0"> <th align=left> Program Coverage Total</tt></th> <td align="right">83%</td><td>5/6</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="83%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">58%</td><td>7/12</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="58%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">71%</td><td>68/95</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="71%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr> -</table></html> +</table></body></html> diff --git a/tests/simple/hpc001.stdout b/tests/simple/hpc001.stdout index 20f8a35edc5d3b0c616c18ccec0b4b772f9404b8..68190b1352abb800f2bf1c625a0e41d0f5cd89e9 100644 --- a/tests/simple/hpc001.stdout +++ b/tests/simple/hpc001.stdout @@ -23,7 +23,10 @@ Writing: Main.hs.html -<html><style type="text/css"> +<html> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> +<style type="text/css"> span.lineno { color: white; background: #aaaaaa; border-right: solid white 12px } span.nottickedoff { background: yellow} span.istickedoff { background: white } @@ -33,74 +36,77 @@ span.funcount { font-size: small; color: orange; z-index: 2; position: absolute; span.decl { font-weight: bold } span.spaces { background: white } </style> +</head> +<body> <pre> <span class="lineno"> 1 </span><span class="decl"><span class="istickedoff">main = print (const "Hello" <span class="nottickedoff">"World"</span>)</span></span> </pre> +</body> </html> Writing: hpc_index.html -<html><style type="text/css">table.bar { background-color: #f25913; } +<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><style type="text/css">table.bar { background-color: #f25913; } td.bar { background-color: #60de51; } td.invbar { background-color: #f25913; } table.dashboard { border-collapse: collapse ; border: solid 1px black } .dashboard td { border: solid 1px black } .dashboard th { border: solid 1px black } </style> -<table class="dashboard" width="100%" border=1> +</head><body><table class="dashboard" width="100%" border=1> <tr><th rowspan=2><a href="hpc_index.html">module</a></th><th colspan=3><a href="hpc_index_fun.html">Top Level Definitions</a></th><th colspan=3><a href="hpc_index_alt.html">Alternatives</a></th><th colspan=3><a href="hpc_index_exp.html">Expressions</a></th></tr><tr><th>%</th><th colspan=2>covered / total</th><th>%</th><th colspan=2>covered / total</th><th>%</th><th colspan=2>covered / total</th></tr><tr> <td> <tt>module <a href="Main.hs.html">Main</a></tt></td> <td align="right">100%</td><td>1/1</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="100%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">- </td><td>0/0</td><td width=100> </td><td align="right">75%</td><td>3/4</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="75%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr> <tr></tr><tr style="background: #e0e0e0"> <th align=left> Program Coverage Total</tt></th> <td align="right">100%</td><td>1/1</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="100%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">- </td><td>0/0</td><td width=100> </td><td align="right">75%</td><td>3/4</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="75%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr> -</table></html> +</table></body></html> Writing: hpc_index_fun.html -<html><style type="text/css">table.bar { background-color: #f25913; } +<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><style type="text/css">table.bar { background-color: #f25913; } td.bar { background-color: #60de51; } td.invbar { background-color: #f25913; } table.dashboard { border-collapse: collapse ; border: solid 1px black } .dashboard td { border: solid 1px black } .dashboard th { border: solid 1px black } </style> -<table class="dashboard" width="100%" border=1> +</head><body><table class="dashboard" width="100%" border=1> <tr><th rowspan=2><a href="hpc_index.html">module</a></th><th colspan=3><a href="hpc_index_fun.html">Top Level Definitions</a></th><th colspan=3><a href="hpc_index_alt.html">Alternatives</a></th><th colspan=3><a href="hpc_index_exp.html">Expressions</a></th></tr><tr><th>%</th><th colspan=2>covered / total</th><th>%</th><th colspan=2>covered / total</th><th>%</th><th colspan=2>covered / total</th></tr><tr> <td> <tt>module <a href="Main.hs.html">Main</a></tt></td> <td align="right">100%</td><td>1/1</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="100%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">- </td><td>0/0</td><td width=100> </td><td align="right">75%</td><td>3/4</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="75%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr> <tr></tr><tr style="background: #e0e0e0"> <th align=left> Program Coverage Total</tt></th> <td align="right">100%</td><td>1/1</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="100%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">- </td><td>0/0</td><td width=100> </td><td align="right">75%</td><td>3/4</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="75%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr> -</table></html> +</table></body></html> Writing: hpc_index_alt.html -<html><style type="text/css">table.bar { background-color: #f25913; } +<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><style type="text/css">table.bar { background-color: #f25913; } td.bar { background-color: #60de51; } td.invbar { background-color: #f25913; } table.dashboard { border-collapse: collapse ; border: solid 1px black } .dashboard td { border: solid 1px black } .dashboard th { border: solid 1px black } </style> -<table class="dashboard" width="100%" border=1> +</head><body><table class="dashboard" width="100%" border=1> <tr><th rowspan=2><a href="hpc_index.html">module</a></th><th colspan=3><a href="hpc_index_fun.html">Top Level Definitions</a></th><th colspan=3><a href="hpc_index_alt.html">Alternatives</a></th><th colspan=3><a href="hpc_index_exp.html">Expressions</a></th></tr><tr><th>%</th><th colspan=2>covered / total</th><th>%</th><th colspan=2>covered / total</th><th>%</th><th colspan=2>covered / total</th></tr><tr> <td> <tt>module <a href="Main.hs.html">Main</a></tt></td> <td align="right">100%</td><td>1/1</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="100%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">- </td><td>0/0</td><td width=100> </td><td align="right">75%</td><td>3/4</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="75%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr> <tr></tr><tr style="background: #e0e0e0"> <th align=left> Program Coverage Total</tt></th> <td align="right">100%</td><td>1/1</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="100%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">- </td><td>0/0</td><td width=100> </td><td align="right">75%</td><td>3/4</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="75%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr> -</table></html> +</table></body></html> Writing: hpc_index_exp.html -<html><style type="text/css">table.bar { background-color: #f25913; } +<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><style type="text/css">table.bar { background-color: #f25913; } td.bar { background-color: #60de51; } td.invbar { background-color: #f25913; } table.dashboard { border-collapse: collapse ; border: solid 1px black } .dashboard td { border: solid 1px black } .dashboard th { border: solid 1px black } </style> -<table class="dashboard" width="100%" border=1> +</head><body><table class="dashboard" width="100%" border=1> <tr><th rowspan=2><a href="hpc_index.html">module</a></th><th colspan=3><a href="hpc_index_fun.html">Top Level Definitions</a></th><th colspan=3><a href="hpc_index_alt.html">Alternatives</a></th><th colspan=3><a href="hpc_index_exp.html">Expressions</a></th></tr><tr><th>%</th><th colspan=2>covered / total</th><th>%</th><th colspan=2>covered / total</th><th>%</th><th colspan=2>covered / total</th></tr><tr> <td> <tt>module <a href="Main.hs.html">Main</a></tt></td> <td align="right">100%</td><td>1/1</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="100%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">- </td><td>0/0</td><td width=100> </td><td align="right">75%</td><td>3/4</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="75%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr> <tr></tr><tr style="background: #e0e0e0"> <th align=left> Program Coverage Total</tt></th> <td align="right">100%</td><td>1/1</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="100%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td><td align="right">- </td><td>0/0</td><td width=100> </td><td align="right">75%</td><td>3/4</td><td width=100><table cellpadding=0 cellspacing=0 width="100" class="bar"><tr><td><table cellpadding=0 cellspacing=0 width="75%"><tr><td height=12 class="bar"></td></tr></table></td></tr></table></td></tr> -</table></html> +</table></body></html> diff --git a/tests/simple/tixs/hpc_markup_001.stdout b/tests/simple/tixs/hpc_markup_001.stdout index 60824c276bd7f5f21893d25be3f231a0c3b622f1..42da970d11edebffa982f1a5f4592e27e7f82d11 100644 --- a/tests/simple/tixs/hpc_markup_001.stdout +++ b/tests/simple/tixs/hpc_markup_001.stdout @@ -3,7 +3,10 @@ Writing: hpc_index.html Writing: hpc_index_fun.html Writing: hpc_index_alt.html Writing: hpc_index_exp.html -<html><style type="text/css"> +<html> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> +<style type="text/css"> span.lineno { color: white; background: #aaaaaa; border-right: solid white 12px } span.nottickedoff { color: #404040; background: white; font-style: oblique } span.istickedoff { color: black; background: #d0c0ff; font-style: normal; } @@ -13,8 +16,11 @@ span.funcount { font-size: small; color: orange; z-index: 2; position: absolute; span.decl { font-weight: bold; background: #d0c0ff } span.spaces { background: white } </style> +</head> +<body> <pre> <span class="lineno"> 1 </span><span class="decl"><span class="istickedoff">main = print (const "Hello" <span class="nottickedoff">"World"</span>)</span></span> </pre> +</body> </html> diff --git a/tests/simple/tixs/hpc_markup_002.stdout b/tests/simple/tixs/hpc_markup_002.stdout index c93488888cd8bf28e7ff5f0926561337b94d6d3d..1225aeaa9c9f6b15f8ad482b52886d6d68ca33d9 100644 --- a/tests/simple/tixs/hpc_markup_002.stdout +++ b/tests/simple/tixs/hpc_markup_002.stdout @@ -3,7 +3,10 @@ Writing: hpc_index.html Writing: hpc_index_fun.html Writing: hpc_index_alt.html Writing: hpc_index_exp.html -<html><style type="text/css"> +<html> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> +<style type="text/css"> span.lineno { color: white; background: #aaaaaa; border-right: solid white 12px } span.nottickedoff { background: yellow} span.istickedoff { background: white } @@ -13,8 +16,11 @@ span.funcount { font-size: small; color: orange; z-index: 2; position: absolute; span.decl { font-weight: bold } span.spaces { background: white } </style> +</head> +<body> <pre> <span class="lineno"> 1 </span><span class="funcount">-- entered once</span><span class="decl"><span class="istickedoff">main = print (const "Hello" <span class="nottickedoff">"World"</span>)</span></span> </pre> +</body> </html>