some fixes

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7198 b3059339-0415-0410-9bf9-f77b7e298cf2

3 files changed, 12 insertions, 4 deletions

diff --git a/TOOLS/benchmark-gab/benchmark b/TOOLS/benchmark-gab/benchmark
index 0c438e2bef..04a0d0e876 100755
--- a/TOOLS/benchmark-gab/benchmark
+++ b/TOOLS/benchmark-gab/benchmark
@@ -2,6 +2,11 @@
 
 . ./variables
 
+if [ ! -e $MPBIN ]; then
+  wrtlog No MPlayer binary compiled for this arch, trying ./mplayer
+  export MPBIN="./mplayer"
+fi
+
 function benchsamples {
 for i in `ls samples/* | grep -v -e '\.opts'`; do
   BENCHOPTS=`cat $i.opts 2> /dev/null`
@@ -12,17 +17,17 @@ for i in `ls samples/* | grep -v -e '\.opts'`; do
   wrtlog "$DEFAULTOPTS"
   wrtlog "Options for this file:"
   wrtlog "$BENCHOPTS"
-  BENCH="`$BUILD/mplayer $DEFAULTOPTS $BENCHOPTS $i 2>&1 | grep BENCHMARKs`"
+  BENCH="`$MPBIN $DEFAULTOPTS $BENCHOPTS $i 2>&1 | grep BENCHMARKs`"
   VC=`echo $BENCH | awk '{print $11}'`
   SYS=`echo $BENCH | awk '{print $9}'`
   wrtlog Total: $VC \(Sys: $SYS\)
 
-  BENCH="`$BUILD/mplayer $DEFAULTOPTS $BENCHOPTS $i 2>&1 | grep BENCHMARKs`"
+  BENCH="`$MPBIN $DEFAULTOPTS $BENCHOPTS $i 2>&1 | grep BENCHMARKs`"
   VC=`echo $BENCH | awk '{print $11}'`
   SYS=`echo $BENCH | awk '{print $9}'`
   wrtlog Total: $VC \(Sys: $SYS\)
 
-  BENCH="`$BUILD/mplayer $DEFAULTOPTS $BENCHOPTS $i 2>&1 | grep BENCHMARKs`"
+  BENCH="`$MPBIN $DEFAULTOPTS $BENCHOPTS $i 2>&1 | grep BENCHMARKs`"
   VC=`echo $BENCH | awk '{print $11}'`
   SYS=`echo $BENCH | awk '{print $9}'`
   wrtlog Total: $VC \(Sys: $SYS\)
diff --git a/TOOLS/benchmark-gab/start b/TOOLS/benchmark-gab/start
index dd4540a96a..9ee1bc1f55 100755
--- a/TOOLS/benchmark-gab/start
+++ b/TOOLS/benchmark-gab/start
@@ -6,6 +6,7 @@ rm -f $LOGFILE
 
 wrtlog Script version v0.91
 wrtlog CPU: $VENDOR $MODEL $MHZ
+wrtlog CPUFLAGS: $CPUFLAGS
 wrtlog MEM: $MEMORY
 wrtlog VGA: $VGA
 
diff --git a/TOOLS/benchmark-gab/variables b/TOOLS/benchmark-gab/variables
index 4c94826632..412b742279 100755
--- a/TOOLS/benchmark-gab/variables
+++ b/TOOLS/benchmark-gab/variables
@@ -3,10 +3,12 @@ export PATH=$PATH:/sbin:/usr/local/bin:/usr/local/sbin:/usr/X11R6/bin
 
 VENDOR="`cat /proc/cpuinfo | grep vendor_id | cut -c 13-`"
 MODEL="`cat /proc/cpuinfo | grep "model name" | cut -c 14-`"
+CPUFLAGS="`cat /proc/cpuinfo | grep flags | cut -c 10-`"
 MHZ="`cat /proc/cpuinfo  | grep MHz | cut -c 12-14` MHz"
 MEMORY="`cat /proc/meminfo | grep MemTotal | awk '{print $2}'` Kb"
-BUILD="`echo $VENDOR $MODEL $MHZ | tr [\ ] [_]`"
+BUILD="`echo $VENDOR $MODEL $MHZ | tr [\ ] [_] | tr [\/] [_]`"
 VGA="`lspci | grep VGA | cut -c 36-`"
+MPBIN="$BUILD/mplayer"
 
 export LOGFILE="`pwd`/log-$BUILD-`date +\"%Y-%m-%d\"`"
 export COMPILEOPTIONS="--enable-runtime-cpudetection"