[Fuego] [PATCH 1/2] Interbench: support to do tests on different block devices

[Li Xiaoming]

Signed-off-by: Li Xiaoming <lixm.fnst at cn.fujitsu.com>
---
 engine/tests/Benchmark.Interbench/fuego_test.sh | 17 ++++++++++++-----
 engine/tests/Benchmark.Interbench/spec.json     | 20 ++++++++++++++++----
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/engine/tests/Benchmark.Interbench/fuego_test.sh b/engine/tests/Benchmark.Interbench/fuego_test.sh
index 31e6d2f..3faa4d3 100755
--- a/engine/tests/Benchmark.Interbench/fuego_test.sh
+++ b/engine/tests/Benchmark.Interbench/fuego_test.sh
@@ -1,20 +1,27 @@
 tarball=interbench-0.31.tar.bz2
 
+function test_pre_check {
+    assert_define BENCHMARK_INTERBENCH_MOUNT_POINT "ERROR: No mount point specified."
+    assert_define BENCHMARK_INTERBENCH_MOUNT_BLOCKDEV "ERROR: No block device specified."
+}
+
 function test_build {
     patch -p0 < $TEST_HOME/interbench.c.patch
     make CC="$CC" AR="$AR" RANLIB="$RANLIB" CXX="$CXX" CPP="$CPP" CXXCPP="$CXXCPP"
 }
 
 function test_deploy {
-	put interbench  $BOARD_TESTDIR/fuego.$TESTDIR/
+    put interbench  $BOARD_TESTDIR/fuego.$TESTDIR/
 }
 
 function test_run {
-	report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./interbench -L 1 || ./interbench -L 1"  
+    hd_test_mount_prepare $BENCHMARK_INTERBENCH_MOUNT_BLOCKDEV $BENCHMARK_INTERBENCH_MOUNT_POINT
+
+    report "cd $BENCHMARK_INTERBENCH_MOUNT_POINT; $BOARD_TESTDIR/fuego.$TESTDIR/interbench -L 1 || $BOARD_TESTDIR/fuego.$TESTDIR/interbench -L 1"
+
+    hd_test_clean_umount $BENCHMARK_INTERBENCH_MOUNT_BLOCKDEV $BENCHMARK_INTERBENCH_MOUNT_POINT
 }
 
 function test_cleanup {
-	kill_procs interbench
+    kill_procs interbench
 }
-
-
diff --git a/engine/tests/Benchmark.Interbench/spec.json b/engine/tests/Benchmark.Interbench/spec.json
index 67518ff..3db6d82 100644
--- a/engine/tests/Benchmark.Interbench/spec.json
+++ b/engine/tests/Benchmark.Interbench/spec.json
@@ -1,9 +1,21 @@
 {
     "testName": "Benchmark.Interbench",
     "specs": {
-        "default": {},
-        "sata": {},
-        "usb": {},
-        "mmc": {}
+        "default": {
+            "MOUNT_BLOCKDEV":"ROOT",
+            "MOUNT_POINT":"$BOARD_TESTDIR/work"
+        },
+        "sata": {
+            "MOUNT_BLOCKDEV":"$SATA_DEV",
+            "MOUNT_POINT":"$SATA_MP"
+        },
+        "mmc": {
+            "MOUNT_BLOCKDEV":"$MMC_DEV",
+            "MOUNT_POINT":"$MMC_MP"
+        },
+        "usb": {
+            "MOUNT_BLOCKDEV":"$USB_DEV",
+            "MOUNT_POINT":"$USB_MP"
+        }
     }
 }
-- 
2.7.4