X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=tools%2Frun-readtest.sh;h=abdfb254c7b6260fbddfea7d29cfcc8dcb2dd5aa;hb=adc84271ba721fdf49f4c0542e1ce3a4aca6fa2e;hp=5da514bc52e6f5d16abb5e2d1381183d1c154394;hpb=95660a06e295d17e315323aaac9c61dfab3546ed;p=ardour.git

diff --git a/tools/run-readtest.sh b/tools/run-readtest.sh
index 5da514bc52..abdfb254c7 100755
--- a/tools/run-readtest.sh
+++ b/tools/run-readtest.sh
@@ -7,6 +7,7 @@ nocache=
 interleave=
 needfiles=1
 write_blocksize=262144
+args=
 
 if uname -a | grep --silent arwin ; then
     ddmega=m
@@ -19,7 +20,9 @@ while [ $# -gt 1 ] ; do
 	-d) dir=$2; shift; shift ;;
 	-f) filesize=$2; shift; shift ;;
 	-n) numfiles=$2; shift; shift ;;
-	-N) nocache="-s"; shift; shift ;;
+	-M) args="$args -M"; shift ;;
+	-D) args="$args -D"; shift ;;
+	-R) args="$args -R"; shift ;;
         *) break ;;
     esac
 done
@@ -27,7 +30,7 @@ done
 if [ -d $dir -a -f $dir/testfile_1 ] ; then
     # dir exists and has a testfile within it - reuse to avoid
     # recreating files
-    echo "Re-using files in $dir"
+    echo "# Re-using files in $dir"
     needfiles=
 else
     dir=$dir/readtest_$$
@@ -40,7 +43,7 @@ else
 fi
 
 if [ x$needfiles != x ] ; then
-    echo "Building files for test..."
+    echo "# Building files for test..."
     if [ x$interleave = x ] ; then
 	
 	#
@@ -61,7 +64,7 @@ if [ x$needfiles != x ] ; then
 	limit=`expr $filesize * 1048576`
 	while [ $size -lt $limit ] ; do
 	    for i in `seq 1 $numfiles` ; do
-		dd if=/dev/zero bs=$write_blocksize count=1 >> $dir/testfile_$i >/dev/null 2>&1
+		dd if=/dev/zero bs=$write_blocksize count=1 >> $dir/testfile_$i 2>/dev/null
 	    done
 	    size=`expr $size + $write_blocksize`
 	done
@@ -73,14 +76,14 @@ for bs in $@ ; do
     if uname -a | grep --silent arwin ; then
         # clears cache on OS X
         sudo purge
-    elif [ -f /proc/sys/vm/drop_cache ] ; then
+    elif [ -f /proc/sys/vm/drop_caches ] ; then
         # Linux cache clearing
-        echo 3 | sudo tee /proc/sys/vm/drop/cache >/dev/null
+        echo 3 | sudo tee /proc/sys/vm/drop_caches >/dev/null
     else       
         # need an alternative for other operating systems
         :
     fi
     
-    echo "Blocksize $bs"
-    ./readtest $nocache -b $bs -q $dir/testfile_%d
+    echo "# Blocksize $bs"
+    ./readtest $args -b $bs -q $dir/testfile_%d
 done