[Fuego] dbench fixes

[Fuego] dbench fixes

[Daniel Sangorrin]

Hi Tim,

I added a version check for dbench4 and fixed a few other issues.

[PATCH 1/6] dbench: check the version of the command
[PATCH 2/6] dbench: remove B option for distribution dbench
[PATCH 3/6] dbench: sync should be run on the target not on docker
[PATCH 4/6] dbench3: put checks in test_pre_check
[PATCH 5/6] dbench3: replace sleep by a sync instruction
[PATCH 6/6] dbench3: remove trailing spaces

Thanks,
Daniel

[Fuego] [PATCH 1/6] dbench: check the version of the command

[Daniel Sangorrin]

Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>
---
 engine/tests/Benchmark.dbench4/fuego_test.sh | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/engine/tests/Benchmark.dbench4/fuego_test.sh b/engine/tests/Benchmark.dbench4/fuego_test.sh
index 9890618..9eb28da 100755
--- a/engine/tests/Benchmark.dbench4/fuego_test.sh
+++ b/engine/tests/Benchmark.dbench4/fuego_test.sh
@@ -6,7 +6,18 @@ function test_pre_check {
     assert_define BENCHMARK_DBENCH_MOUNT_POINT
     assert_define BENCHMARK_DBENCH_TIMELIMIT
     assert_define BENCHMARK_DBENCH_NPROCS
+
     is_on_target_path dbench PROGRAM_DBENCH
+    if [ ! -z "$PROGRAM_DBENCH" ]; then
+        help=$(cmd "dbench --help") || true
+        version=$(echo $help | head -1 | cut -d' ' -f 3)
+        if [ "$version" != "4.00" ]; then
+            echo "dbench found on the target but version $version is not supported."
+            PROGRAM_DBENCH=""
+        else
+            echo "dbench found on the target (version $version)."
+        fi
+    fi
 }
 
 function test_build {
-- 
2.7.4

[Fuego] [PATCH 2/6] dbench: remove B option for distribution dbench

[Daniel Sangorrin]

dbench4 actually does not have the -B option (e.g. check the
dbench distributed by debian jessie). The -B option is reqired
for the latest git version, which still has 4.00 in its Makefile
but probably will have a new version when released.

Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>
---
 engine/tests/Benchmark.dbench4/fuego_test.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/engine/tests/Benchmark.dbench4/fuego_test.sh b/engine/tests/Benchmark.dbench4/fuego_test.sh
index 9eb28da..82261ab 100755
--- a/engine/tests/Benchmark.dbench4/fuego_test.sh
+++ b/engine/tests/Benchmark.dbench4/fuego_test.sh
@@ -56,8 +56,7 @@ function test_run {
             $BENCHMARK_DBENCH_NPROCS"
     else
         report "cd $BOARD_TESTDIR/fuego.$TESTDIR; \
-            dbench -B fileio \
-            -D $BENCHMARK_DBENCH_MOUNT_POINT/fuego.$TESTDIR \
+            dbench -D $BENCHMARK_DBENCH_MOUNT_POINT/fuego.$TESTDIR \
             -t $BENCHMARK_DBENCH_TIMELIMIT \
             $BENCHMARK_DBENCH_EXTRAPARAMS \
             $BENCHMARK_DBENCH_NPROCS"
-- 
2.7.4

[Fuego] [PATCH 3/6] dbench: sync should be run on the target not on docker

[Daniel Sangorrin]

Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>
---
 engine/tests/Benchmark.dbench4/fuego_test.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/engine/tests/Benchmark.dbench4/fuego_test.sh b/engine/tests/Benchmark.dbench4/fuego_test.sh
index 82261ab..7df8822 100755
--- a/engine/tests/Benchmark.dbench4/fuego_test.sh
+++ b/engine/tests/Benchmark.dbench4/fuego_test.sh
@@ -53,15 +53,16 @@ function test_run {
             -D $BENCHMARK_DBENCH_MOUNT_POINT/fuego.$TESTDIR \
             -t $BENCHMARK_DBENCH_TIMELIMIT \
             $BENCHMARK_DBENCH_EXTRAPARAMS \
-            $BENCHMARK_DBENCH_NPROCS"
+            $BENCHMARK_DBENCH_NPROCS; \
+            sync"
     else
         report "cd $BOARD_TESTDIR/fuego.$TESTDIR; \
             dbench -D $BENCHMARK_DBENCH_MOUNT_POINT/fuego.$TESTDIR \
             -t $BENCHMARK_DBENCH_TIMELIMIT \
             $BENCHMARK_DBENCH_EXTRAPARAMS \
-            $BENCHMARK_DBENCH_NPROCS"
+            $BENCHMARK_DBENCH_NPROCS; \
+            sync"
     fi
-    sync
     hd_test_clean_umount $BENCHMARK_DBENCH_MOUNT_BLOCKDEV \
         $BENCHMARK_DBENCH_MOUNT_POINT
 }
-- 
2.7.4

[Fuego] [PATCH 4/6] dbench3: put checks in test_pre_check

[Daniel Sangorrin]

Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>
---
 engine/tests/Benchmark.dbench3/fuego_test.sh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/engine/tests/Benchmark.dbench3/fuego_test.sh b/engine/tests/Benchmark.dbench3/fuego_test.sh
index 3ec4ad1..218184c 100755
--- a/engine/tests/Benchmark.dbench3/fuego_test.sh
+++ b/engine/tests/Benchmark.dbench3/fuego_test.sh
@@ -1,5 +1,12 @@
 tarball=dbench-3.04.tar.gz
 
+function test_pre_check {
+    assert_define BENCHMARK_DBENCH3_MOUNT_BLOCKDEV
+    assert_define BENCHMARK_DBENCH3_MOUNT_POINT
+    assert_define BENCHMARK_DBENCH3_TIMELIMIT
+    assert_define BENCHMARK_DBENCH3_NPROCS
+}
+
 function test_build {
     patch -N -s -p1 < $TEST_HOME/dbench_startup.patch
     ./configure --host=$HOST --build=`uname -m`-linux-gnu  CFLAGS="$CFLAGS";
@@ -11,11 +18,6 @@ function test_deploy {
 }
 
 function test_run {
-    assert_define BENCHMARK_DBENCH3_MOUNT_BLOCKDEV
-    assert_define BENCHMARK_DBENCH3_MOUNT_POINT
-    assert_define BENCHMARK_DBENCH3_TIMELIMIT
-    assert_define BENCHMARK_DBENCH3_NPROCS
-    
     hd_test_mount_prepare $BENCHMARK_DBENCH3_MOUNT_BLOCKDEV \
         $BENCHMARK_DBENCH3_MOUNT_POINT
         
-- 
2.7.4

[Fuego] [PATCH 5/6] dbench3: replace sleep by a sync instruction

[Daniel Sangorrin]

Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>
---
 engine/tests/Benchmark.dbench3/fuego_test.sh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/engine/tests/Benchmark.dbench3/fuego_test.sh b/engine/tests/Benchmark.dbench3/fuego_test.sh
index 218184c..d016bdd 100755
--- a/engine/tests/Benchmark.dbench3/fuego_test.sh
+++ b/engine/tests/Benchmark.dbench3/fuego_test.sh
@@ -27,10 +27,9 @@ function test_run {
         -D $BENCHMARK_DBENCH3_MOUNT_POINT/fuego.$TESTDIR \
         -c $BENCHMARK_DBENCH3_MOUNT_POINT/fuego.$TESTDIR/client.txt \
         $BENCHMARK_DBENCH3_NPROCS; \
-        rm $BENCHMARK_DBENCH3_MOUNT_POINT/fuego.$TESTDIR/client.txt"
-    
-    sleep 5
-        
+        rm $BENCHMARK_DBENCH3_MOUNT_POINT/fuego.$TESTDIR/client.txt; \
+        sync"
+
     hd_test_clean_umount $BENCHMARK_DBENCH3_MOUNT_BLOCKDEV \
         $BENCHMARK_DBENCH3_MOUNT_POINT
 }
-- 
2.7.4

[Fuego] [PATCH 6/6] dbench3: remove trailing spaces

[Daniel Sangorrin]

Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>
---
 engine/tests/Benchmark.dbench3/fuego_test.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engine/tests/Benchmark.dbench3/fuego_test.sh b/engine/tests/Benchmark.dbench3/fuego_test.sh
index d016bdd..b3d2a67 100755
--- a/engine/tests/Benchmark.dbench3/fuego_test.sh
+++ b/engine/tests/Benchmark.dbench3/fuego_test.sh
@@ -14,13 +14,13 @@ function test_build {
 }
 
 function test_deploy {
-    put dbench client.txt $BOARD_TESTDIR/fuego.$TESTDIR/ 
+    put dbench client.txt $BOARD_TESTDIR/fuego.$TESTDIR/
 }
 
 function test_run {
     hd_test_mount_prepare $BENCHMARK_DBENCH3_MOUNT_BLOCKDEV \
         $BENCHMARK_DBENCH3_MOUNT_POINT
-        
+
     report "cd $BOARD_TESTDIR/fuego.$TESTDIR; \
         cp client.txt $BENCHMARK_DBENCH3_MOUNT_POINT/fuego.$TESTDIR; \
         pwd; ./dbench -t $BENCHMARK_DBENCH3_TIMELIMIT \
-- 
2.7.4

Re: [Fuego] dbench fixes

[Tim.Bird]

These all look good.  Applied and pushed.

I did one change, which I'll comment on in an additional e-mail.

Thanks!
 -- Tim


> -----Original Message-----
> From: Daniel Sangorrin
> Hi Tim,
> 
> I added a version check for dbench4 and fixed a few other issues.
> 
> [PATCH 1/6] dbench: check the version of the command
> [PATCH 2/6] dbench: remove B option for distribution dbench
> [PATCH 3/6] dbench: sync should be run on the target not on docker
> [PATCH 4/6] dbench3: put checks in test_pre_check
> [PATCH 5/6] dbench3: replace sleep by a sync instruction
> [PATCH 6/6] dbench3: remove trailing spaces
> 
> Thanks,
> Daniel

Re: [Fuego] [PATCH 1/6] dbench: check the version of the command

[Tim.Bird]

> -----Original Message-----
> From: Daniel Sangorrin
> 
> Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>
> ---
>  engine/tests/Benchmark.dbench4/fuego_test.sh | 11 +++++++++++
>  1 file changed, 11 insertions(+)
> 
> diff --git a/engine/tests/Benchmark.dbench4/fuego_test.sh
> b/engine/tests/Benchmark.dbench4/fuego_test.sh
> index 9890618..9eb28da 100755
> --- a/engine/tests/Benchmark.dbench4/fuego_test.sh
> +++ b/engine/tests/Benchmark.dbench4/fuego_test.sh
> @@ -6,7 +6,18 @@ function test_pre_check {
>      assert_define BENCHMARK_DBENCH_MOUNT_POINT
>      assert_define BENCHMARK_DBENCH_TIMELIMIT
>      assert_define BENCHMARK_DBENCH_NPROCS
> +
>      is_on_target_path dbench PROGRAM_DBENCH
> +    if [ ! -z "$PROGRAM_DBENCH" ]; then
> +        help=$(cmd "dbench --help") || true
> +        version=$(echo $help | head -1 | cut -d' ' -f 3)
> +        if [ "$version" != "4.00" ]; then
My only issue is that this is a little strict.  I know that 4.00 matches the version in our
current tarfile, but this check would fail if we found version 4.01 on the target board.

I added a new function version_lt (version "less than"), and use it here so that it reads:

    if version_lt $version 4.00 ; then

This means the check doesn't have to change when we upgrade the version of
dbench in the tarfile, and allows this test to work with newer versions of dbench
found on the target.
 
 -- Tim

> +            echo "dbench found on the target but version $version is not
> supported."
> +            PROGRAM_DBENCH=""
> +        else
> +            echo "dbench found on the target (version $version)."
> +        fi
> +    fi
>  }
> 
>  function test_build {
> --
> 2.7.4

Re: [Fuego] [PATCH 1/6] dbench: check the version of the command

[Daniel Sangorrin]

> >      is_on_target_path dbench PROGRAM_DBENCH
> > +    if [ ! -z "$PROGRAM_DBENCH" ]; then
> > +        help=$(cmd "dbench --help") || true
> > +        version=$(echo $help | head -1 | cut -d' ' -f 3)
> > +        if [ "$version" != "4.00" ]; then
> My only issue is that this is a little strict.  I know that 4.00 matches the version in our
> current tarfile, but this check would fail if we found version 4.01 on the target board.
> 
> I added a new function version_lt (version "less than"), and use it here so that it reads:
> 
>     if version_lt $version 4.00 ; then
> 
> This means the check doesn't have to change when we upgrade the version of
> dbench in the tarfile, and allows this test to work with newer versions of dbench
> found on the target.
> 

Thanks for that.

Daniel



>  -- Tim
> 
> > +            echo "dbench found on the target but version $version is not
> > supported."
> > +            PROGRAM_DBENCH=""
> > +        else
> > +            echo "dbench found on the target (version $version)."
> > +        fi
> > +    fi
> >  }
> >
> >  function test_build {
> > --
> > 2.7.4
>