correct spellings

diff --git a/generatedoc.sh b/generatedoc.sh
index fdf568e987539de2716514feed128164f1e61a58..62252dba0624f7482a6ac212d8269229ada75fcb 100755 (executable)
--- a/generatedoc.sh
+++ b/generatedoc.sh
@@ -23,7 +23,7 @@ for tab; do
   echo "<h3>Statistic summary</h3>"
 
   echo "<table border=\"1\" cellpadding=\"5\" cellspacing=\"2\" width=\"100%\">"
-  echo "<thead><tr><th width=\"12%\">Load<br>(%)</th><th width=\"12%\">Minimum<br>(us)</th><th width=\"12%\">Average<br>(us)</th><th width=\"12%\">Maximun<br>(us)</th><th width=\"12%\">Standard Dev.<br>(us)</th><th width=\"12%\">25th %<br>(us)</th><th width=\"12%\">Median<br>(us)</th><th width=\"12%\">75th %<br>(us)</th></tr></thead>"
+  echo "<thead><tr><th width=\"12%\">Load<br>(%)</th><th width=\"12%\">Minimum<br>(µs)</th><th width=\"12%\">Average<br>(µs)</th><th width=\"12%\">Maximum<br>(µs)</th><th width=\"12%\">Standard Dev.<br>(µs)</th><th width=\"12%\">25th %<br>(µs)</th><th width=\"12%\">Median<br>(µs)</th><th width=\"12%\">75th %<br>(µs)</th></tr></thead>"
   echo "<tbody>"
   awk '{ printf "<tr>"; for (i=0; i<NF; i++) printf "<td>%s</td>", $(i+1); printf "</tr>\n" }' $tab
   echo "</tbody>"
@@ -41,5 +41,6 @@ for tab; do
 
 done
 
+echo "<p>.</p>
 echo "</body>"
 echo "</html>"

diff --git a/getname.sh b/getname.sh
index d35e2dea7c67120281a0a9c7ca539492714b4ad7..70dda614b19ec718a1627987264a297cd7b41b49 100755 (executable)
--- a/getname.sh
+++ b/getname.sh
@@ -11,7 +11,7 @@ case "$1" in
   done
   ;;
 -r)
-  awk -F\" '/test='$2';;/ {print $2}' $0
+  awk -F\" '/test='$(echo $2 | sed 's/\([+.*]\)/\\\0/g')';;/ {print $2}' $0
   ;;
 *)
   case "$*" in

diff --git a/gettable.awk b/gettable.awk
index 13ecff78b56f13e049a317c0f1c0c391542407fa..cb6b5d02ebb2729a045ce452336bf452602ff398 100755 (executable)
--- a/gettable.awk
+++ b/gettable.awk
@@ -3,7 +3,7 @@
 BEGIN {
     OFS=","
     if (!nohead) {
-        print "Test", "Dedicated core(s)", "Load (%)", "Minimum (us)", "Average (us)", "Maximun (us)", "Standard Dev. (us)", "25th % (us)", "Median (us)", "75th % (us)"
+        print "Test", "Dedicated core(s)", "Load (%)", "Minimum (µs)", "Average (µs)", "Maximum (µs)", "Standard Dev. (µs)", "25th % (µs)", "Median (µs)", "75th % (µs)"
     }
 }
 

diff --git a/test.sh b/test.sh
index 6b6c2677be3b86d6d8ff7a095ca83e762608c55f..a32cc856d1b7740e0edf54ffe5cb38ad9db5c1e0 100755 (executable)
--- a/test.sh
+++ b/test.sh
@@ -11,12 +11,14 @@ run() {
     test=$(echo $exe | sed 's/\.exe//')
     name=$test-${dcore}k-${load}%
     echo -e "\033[0;1mTest $test\033[0;0m"
-    ./getinfo.sh | tee $name.log
+    date | tee $name.log
+    ./getinfo.sh | tee -a $name.log
     echo "CPU load: $load% ($lcpu/$nbcpu)" | tee -a $name.log
     { ./$exe -d 1 -k $dcore -n 10000 -s -o $name.dat | tee -a $name.log; \
       kill -2 $(ps -e | awk '/[l]oad/ || /[s]leep/ { print $1 }') 2>/dev/null; } &
     ./load -n $lcpu >/dev/null
     echo "Cleaning..."
+    date | tee -a $name.log
     sleep 1
   done
 }