[Fuego] [PATCH 1/7] dbench: move asserts to pre_check

Daniel Sangorrin daniel.sangorrin at toshiba.co.jp
Fri Mar 23 07:21:24 UTC 2018


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

diff --git a/engine/tests/Benchmark.dbench/fuego_test.sh b/engine/tests/Benchmark.dbench/fuego_test.sh
index f7160f9..431b682 100755
--- a/engine/tests/Benchmark.dbench/fuego_test.sh
+++ b/engine/tests/Benchmark.dbench/fuego_test.sh
@@ -1,5 +1,12 @@
 tarball=dbench-3.04.tar.gz
 
+function test_pre_check {
+    assert_define BENCHMARK_DBENCH_MOUNT_BLOCKDEV
+    assert_define BENCHMARK_DBENCH_MOUNT_POINT
+    assert_define BENCHMARK_DBENCH_TIMELIMIT
+    assert_define BENCHMARK_DBENCH_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_DBENCH_MOUNT_BLOCKDEV
-    assert_define BENCHMARK_DBENCH_MOUNT_POINT
-    assert_define BENCHMARK_DBENCH_TIMELIMIT
-    assert_define BENCHMARK_DBENCH_NPROCS
-    
     hd_test_mount_prepare $BENCHMARK_DBENCH_MOUNT_BLOCKDEV $BENCHMARK_DBENCH_MOUNT_POINT
         
     report "cd $BOARD_TESTDIR/fuego.$TESTDIR; cp client.txt $BENCHMARK_DBENCH_MOUNT_POINT/fuego.$TESTDIR; pwd; ./dbench -t $BENCHMARK_DBENCH_TIMELIMIT -D $BENCHMARK_DBENCH_MOUNT_POINT/fuego.$TESTDIR -c $BENCHMARK_DBENCH_MOUNT_POINT/fuego.$TESTDIR/client.txt $BENCHMARK_DBENCH_NPROCS; rm $BENCHMARK_DBENCH_MOUNT_POINT/fuego.$TESTDIR/client.txt"
-- 
2.7.4




More information about the Fuego mailing list