[Dacapobench-commits] SF.net SVN: dacapobench:[413] benchmarks/trunk/regression

[<ste...@us...>]

Revision: 413
          http://dacapobench.svn.sourceforge.net/dacapobench/?rev=413&view=rev
Author:   steveb-oss
Date:     2008-07-30 02:31:57 +0000 (Wed, 30 Jul 2008)

Log Message:
-----------
more minor tweaks

Modified Paths:
--------------
    benchmarks/trunk/regression/plot.pl
    benchmarks/trunk/regression/regression.pl

Modified: benchmarks/trunk/regression/plot.pl
===================================================================
--- benchmarks/trunk/regression/plot.pl	2008-07-30 02:20:10 UTC (rev 412)
+++ benchmarks/trunk/regression/plot.pl	2008-07-30 02:31:57 UTC (rev 413)
@@ -45,7 +45,7 @@
 make_all_svg(\%bmlist);
 make_all_png();
 make_all_tables(\%bmlist);
-
+system("cp ../log/$id/*version.txt $publish_html");
 #system("cp www/*.html /home/dacapo/www/regression/perf");
 #system("cp png/*.png /home/dacapo/www/regression/perf/png");
 
@@ -115,7 +115,7 @@
   $job = "rm -f $root_dir/$png_path/*_small.png";
   system($job);
 #  $job = "java -jar $root_dir/$bin_path/batik-1.7/batik-rasterizer.jar $root_dir/$svg_path -d $root_dir/$png_path";
-  $job = "cjava -jar $root_dir/$bin_path/batik-1.7/batik-rasterizer.jar $root_dir/$svg_path -d $root_dir/$png_path";
+  $job = "java -jar $root_dir/$bin_path/batik-1.7/batik-rasterizer.jar $root_dir/$svg_path -d $root_dir/$png_path";
   system($job);
   my @large_pngs;
   ls_to_array("$root_dir/$png_path", \@large_pngs);

Modified: benchmarks/trunk/regression/regression.pl
===================================================================
--- benchmarks/trunk/regression/regression.pl	2008-07-30 02:20:10 UTC (rev 412)
+++ benchmarks/trunk/regression/regression.pl	2008-07-30 02:31:57 UTC (rev 413)
@@ -55,9 +55,10 @@
   my $vm;
   foreach $vm (@vms) { 
     my $java = $root_dir."/".$vm_exe{$vm};
-    do_system($log, "$java -version > $root_dir/$log_path/$id/$vm-version.txt 2>&1");
+    do_system($log, "echo \"$java\" > $root_dir/$log_path/$id/$vm-version.txt 2>&1");
+    do_system($log, "$java -version >> $root_dir/$log_path/$id/$vm-version.txt 2>&1");
   }
-  do_system($log, "cat /proc/cpu > $root_dir/$log_path/$id/cpu-version.txt");
+  do_system($log, "cat /proc/cpuinfo > $root_dir/$log_path/$id/cpu-version.txt");
   do_system($log, "uname -a > $root_dir/$log_path/$id/os-version.txt");
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.