From 3ca9651c75278f0f059278c8c78f6326c67c1e7c Mon Sep 17 00:00:00 2001
From: Charles Manning <cdhmanning@gmail.com>
Date: Fri, 12 Oct 2012 16:40:00 +1300
Subject: [PATCH] Add both regular nor and m18 tests to test harness

Signed-off-by: Charles Manning <cdhmanning@gmail.com>
---
 .../tests/init_fw_update_test_m18.sh          |  1 +
 direct/test-framework/tests/launch_tests.sh   |  9 ++++--
 .../test-framework/tests/manage_m18_test.sh   | 28 +++++++++++++++++++
 .../test-framework/tests/manage_m18_tests.sh  | 26 +++++++++++++++++
 .../tests/run_fw_update_test_m18.sh           |  3 ++
 5 files changed, 65 insertions(+), 2 deletions(-)
 create mode 100755 direct/test-framework/tests/manage_m18_test.sh
 create mode 100755 direct/test-framework/tests/manage_m18_tests.sh

diff --git a/direct/test-framework/tests/init_fw_update_test_m18.sh b/direct/test-framework/tests/init_fw_update_test_m18.sh
index 4957990..0460897 100755
--- a/direct/test-framework/tests/init_fw_update_test_m18.sh
+++ b/direct/test-framework/tests/init_fw_update_test_m18.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 # Run this to initialise the file system for the test runs.
+set -x
 rm seed-m18-*
 rm emfile-m18*
 ./yaffs_test  -u -i M18-1
diff --git a/direct/test-framework/tests/launch_tests.sh b/direct/test-framework/tests/launch_tests.sh
index 779fa48..b2041d3 100755
--- a/direct/test-framework/tests/launch_tests.sh
+++ b/direct/test-framework/tests/launch_tests.sh
@@ -20,8 +20,13 @@ fi
 
 
 xterm  -e "$LAUNCHDIR/manage_nor_test.sh  0 $iterations"&
-xterm  -e "$LAUNCHDIR/manage_nand_test.sh  0 $iterations"&
 xterm  -e "$LAUNCHDIR/manage_nor_test.sh  1 $iterations"&
-xterm  -e "$LAUNCHDIR/manage_nand_test.sh  1 $iterations"&
 xterm  -e "$LAUNCHDIR/manage_nor_test.sh  2 $iterations"&
+
+xterm  -e "$LAUNCHDIR/manage_m18_test.sh  0 $iterations"&
+xterm  -e "$LAUNCHDIR/manage_m18_test.sh  1 $iterations"&
+xterm  -e "$LAUNCHDIR/manage_m18_test.sh  2 $iterations"&
+
+xterm  -e "$LAUNCHDIR/manage_nand_test.sh  0 $iterations"&
+xterm  -e "$LAUNCHDIR/manage_nand_test.sh  1 $iterations"&
 xterm  -e "$LAUNCHDIR/manage_nand_test.sh  2 $iterations"&
diff --git a/direct/test-framework/tests/manage_m18_test.sh b/direct/test-framework/tests/manage_m18_test.sh
new file mode 100755
index 0000000..17a41a3
--- /dev/null
+++ b/direct/test-framework/tests/manage_m18_test.sh
@@ -0,0 +1,28 @@
+#! /bin/sh
+
+set -x
+
+dir_id=-none
+[ -z $1 ] || dir_id=$1
+
+
+iterations=100000
+
+[ -z $2 ]  || iterations=$2
+
+STARTDIR=`pwd`
+RUNDIR=`pwd`/tmp/m18-$dir_id
+mkdir $RUNDIR
+cd $RUNDIR
+cp $STARTDIR/*sh .
+ln -s $STARTDIR/yaffs_test yaffs_test
+
+./init_fw_update_test_m18.sh
+./run_fw_update_test_m18.sh $iterations
+
+echo "!!!!!!!!!!!"
+echo "Tests done"
+while true
+do
+sleep 10
+done
diff --git a/direct/test-framework/tests/manage_m18_tests.sh b/direct/test-framework/tests/manage_m18_tests.sh
new file mode 100755
index 0000000..5ddd6aa
--- /dev/null
+++ b/direct/test-framework/tests/manage_m18_tests.sh
@@ -0,0 +1,26 @@
+#! /bin/sh
+
+dir_id=-none
+[ -z $1 ] || dir_id=$1
+
+
+iterations=100000
+
+[ -z $2 ]  || iterations=$2
+
+STARTDIR=`pwd`
+RUNDIR=`pwd`/tmp/m18-$dir_id
+mkdir $RUNDIR
+cd $RUNDIR
+cp $STARTDIR/*sh .
+ln -s $STARTDIR/yaffs_test yaffs_test
+
+./init_fw_update_test_m18.sh
+./run_fw_update_test_m18.sh $iterations
+
+echo "!!!!!!!!!!!"
+echo "Tests done"
+while true
+do
+sleep 10
+done
diff --git a/direct/test-framework/tests/run_fw_update_test_m18.sh b/direct/test-framework/tests/run_fw_update_test_m18.sh
index 9271563..f05a263 100755
--- a/direct/test-framework/tests/run_fw_update_test_m18.sh
+++ b/direct/test-framework/tests/run_fw_update_test_m18.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+
+set -x
+
 iterations=100000
 
 [ -z $1 ]  || iterations=$1
-- 
2.30.2