From: <ky...@us...> - 2007-03-13 12:35:27
|
Revision: 363 http://svn.sourceforge.net/crackerjack/?rev=363&view=rev Author: kyagi Date: 2007-03-13 05:35:25 -0700 (Tue, 13 Mar 2007) Log Message: ----------- modify Modified Paths: -------------- trunk/crackerjack/make_report.rb trunk/crackerjack/rails/crackerjack/app/helpers/top_helper.rb trunk/crackerjack/rails/crackerjack/app/views/top/execute.rhtml trunk/crackerjack/rails/crackerjack/app/views/top/list.rhtml Modified: trunk/crackerjack/make_report.rb =================================================================== --- trunk/crackerjack/make_report.rb 2007-03-13 12:24:38 UTC (rev 362) +++ trunk/crackerjack/make_report.rb 2007-03-13 12:35:25 UTC (rev 363) @@ -164,8 +164,6 @@ end print "</tr>", "\n" - - hr.sort.each do |r_kerv, r_id| #print "<tr><td align=\"center\">(R)#{r_kerv}, #{r_id[-1]}</td>" print "<tr><td align=\"center\">(R)#{r_kerv}</td>" @@ -241,12 +239,12 @@ STDOUT.reopen("rhtml/#{filename}.rhtml") print "<html><head><title>#{filename}report</title></head><body>" print "<table border=\"1\" cellpadding=\"5\" cellspacing=\"0\">" - print "<tr><td>System Call</td>" - print "<td>Compatibility</td>" + print "<tr><td>System Call Name</td>" + print "<td>Regression</td>" + print "<td>Actual</td>" print "<td>Expected</td>" - print "<td>Result</td>" - print "<td>Compare STDOUT</td>" - print "<td>Compare STDERR</td>" + print "<td>Compare Result</td>" + print "<td>Compare Log</td>" print "<td>Comare Program</td></tr>" dir = File.join(Dir.pwd, "results", r_kerv, r_id[-1]) @@ -257,27 +255,27 @@ make_column_systemcall(f) + link_result = f.sub(%r!cout.log.*!, 'tout.log').sub(Dir.pwd, '..') + print "<td><a href=\"#{link_result}\">Log</a></td>" + link_exp = File.join(Dir.pwd, "expected",e_kerv, e_id[-1], log2syscallname(f), "tout.log") if File.exist?(link_exp) link_exp.sub!(Dir.pwd, '..') - print "<td><a href=\"#{link_exp}\">link</a></td>" + print "<td><a href=\"#{link_exp}\">Log</a></td>" else print "<td>Not found</td>" end - link_result = f.sub(%r!cout.log.*!, 'tout.log').sub(Dir.pwd, '..') - print "<td><a href=\"#{link_result}\">link</a></td>" - link_compare_out = f.sub(Dir.pwd, '..') - print "<td><a href=\"#{link_compare_out}\">link</a></td>" + print "<td><a href=\"#{link_compare_out}\">Log</a></td>" link_compare_err = f.sub('cout', 'cerr').sub(Dir.pwd, '..') - print "<td><a href=\"#{link_compare_err}\">link</a></td>" + print "<td><a href=\"#{link_compare_err}\">Log</a></td>" - label_cp = "User Defined" + label_cp = "user defined" link_cp = File.join(Dir.pwd, "testcases", syscallname, "compare") unless (File.exists?(link_cp)) - label_cp = "Original" + label_cp = "default" link_cp = File.join(Dir.pwd, "bin", "default-compare") end #make_sub_link("gui", label_cp, link_cp) Modified: trunk/crackerjack/rails/crackerjack/app/helpers/top_helper.rb =================================================================== --- trunk/crackerjack/rails/crackerjack/app/helpers/top_helper.rb 2007-03-13 12:24:38 UTC (rev 362) +++ trunk/crackerjack/rails/crackerjack/app/helpers/top_helper.rb 2007-03-13 12:35:25 UTC (rev 363) @@ -37,7 +37,7 @@ end def button_to_clear - button_to "Clear", :action=>"clear" + button_to "Clear stack", :action=>"clear" end def link_to_readme Modified: trunk/crackerjack/rails/crackerjack/app/views/top/execute.rhtml =================================================================== --- trunk/crackerjack/rails/crackerjack/app/views/top/execute.rhtml 2007-03-13 12:24:38 UTC (rev 362) +++ trunk/crackerjack/rails/crackerjack/app/views/top/execute.rhtml 2007-03-13 12:35:25 UTC (rev 363) @@ -1,8 +1,8 @@ -<table border="0" cellpadding="5" cellspacing="0"> +<table border="1" cellpadding="5" cellspacing="0"> <tr> - <th width="150">syscallname</th> - <th width="150">log(stdout)</th> - <th width="150">log(stderr)</th> + <th width="150">System Call Name</th> + <th width="150">Test Result</th> + <th width="150">Execution Log</th> </tr> <% @tp_list.each do |tp| %> <tr> @@ -10,14 +10,11 @@ <%= tp.syscallname %> </td> <td width="150"> - <%= link_to("stdout", {:action=>'view_log', :arg=>tp.log_stdout}, nil) %> + <%= link_to("Log", {:action=>'view_log', :arg=>tp.log_stdout}, nil) %> </td> <td width="150"> - <%= link_to("stderr", {:action=>'view_log', :arg=>tp.log_stderr}, nil) %> + <%= link_to("Log", {:action=>'view_log', :arg=>tp.log_stderr}, nil) %> </td> </tr> <% end %> -</table> - - - +</table> \ No newline at end of file Modified: trunk/crackerjack/rails/crackerjack/app/views/top/list.rhtml =================================================================== --- trunk/crackerjack/rails/crackerjack/app/views/top/list.rhtml 2007-03-13 12:24:38 UTC (rev 362) +++ trunk/crackerjack/rails/crackerjack/app/views/top/list.rhtml 2007-03-13 12:35:25 UTC (rev 363) @@ -6,7 +6,7 @@ <%= check_box_tag "to_be_ordered", tp %> </td> <td> - <%= submit_tag "add" %> + <%= submit_tag "add stack" %> </td> <%= end_form_tag %> <td> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |