[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-287-g0d340ad

[jorasse <jo...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  0d340adcd9dfce419a70a1ae97f4e000ad9f9b82 (commit)
      from  a445d12935581e081f28b5ad29ae397d4f895edb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0d340adcd9dfce419a70a1ae97f4e000ad9f9b82
Author: Eric Jarrige <eri...@ar...>
Date:   Tue Apr 24 11:35:27 2012 +0200

    [TEST] APF28: add watchdog test case

-----------------------------------------------------------------------

Summary of changes:
 target/test/test_helpers.sh  |    2 ++
 target/test/test_watchdog.sh |    9 ++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/target/test/test_helpers.sh b/target/test/test_helpers.sh
index 2f524ae..a773ff9 100644
--- a/target/test/test_helpers.sh
+++ b/target/test/test_helpers.sh
@@ -146,6 +146,8 @@ execute_for_target()
 	                $1 $BOARD
 	        elif [ "$BOARD" == "APF27" ]; then
 	                $1 $BOARD
+	        elif [ "$BOARD" == "APF28" ]; then
+	                $1 $BOARD
 	        elif [ "$BOARD" == "APF51" ]; then
 	                $1 $BOARD
 	        fi
diff --git a/target/test/test_watchdog.sh b/target/test/test_watchdog.sh
index 51f0208..fba9d97 100755
--- a/target/test/test_watchdog.sh
+++ b/target/test/test_watchdog.sh
@@ -41,13 +41,16 @@ test_watchdog()
 		exit_failed
 	fi
 
-	execute_for_target load_driver
-	if [ "$RES" != 0 ] || [ ! -c "$WATCHDOG_DEV" ] ; then
+	if [ ! -c "$WATCHDOG_DEV" ] ; then
+		execute_for_target load_driver
+	fi
+
+	if [ ! -c "$WATCHDOG_DEV" ] ; then
 		echo "Module failed to load"
 		exit_failed
 	fi
 
-	watchdog -t $(($SEC-2)) /dev/watchdog
+	watchdog -T $(($SEC)) -t $(($SEC-2)) /dev/watchdog
 	if [ "$?" != 0 ]; then
 		echo "Failed to launch userspace helper"
 		exit_failed


hooks/post-receive
-- 
armadeus