[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-714-gf68255d

[Julien B a. A. <ar...@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  f68255d0781a682a7eedf79051b6e67bbe87d16c (commit)
      from  fa2a5750157df78013358e709852aec9a8ac01bf (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 f68255d0781a682a7eedf79051b6e67bbe87d16c
Author: Julien Boibessot <jul...@ar...>
Date:   Fri Apr 24 10:57:08 2015 +0200

    [TESTS] Enhance serial port test for APF28Dev. Improve comment for USB test on APF28Dev aswell.

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

Summary of changes:
 target/test/test_helpers.sh  |   10 +++++-----
 target/test/test_rs232.sh    |   24 ++++++++++++++++++------
 target/test/test_usb_host.sh |    2 +-
 3 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/target/test/test_helpers.sh b/target/test/test_helpers.sh
index b31c5b8..186978b 100755
--- a/target/test/test_helpers.sh
+++ b/target/test/test_helpers.sh
@@ -163,15 +163,15 @@ execute_for_target()
 	BOARD=`cat /etc/machine`
 	if [ "$1" != "" ]; then
 		if [ "$BOARD" == "APF9328" ]; then
-	                $1 $BOARD
+	                $1 $BOARD $2
 	        elif [ "$BOARD" == "APF27" ]; then
-	                $1 $BOARD
+	                $1 $BOARD $2
 	        elif [ "$BOARD" == "APF28" ]; then
-	                $1 $BOARD
+	                $1 $BOARD $2
 	        elif [ "$BOARD" == "APF51" ]; then
-	                $1 $BOARD
+	                $1 $BOARD $2
 	        elif [ "$BOARD" == "APF6" ]; then
-	                $1 $BOARD
+	                $1 $BOARD $2
 		fi
 	fi
 }
diff --git a/target/test/test_rs232.sh b/target/test/test_rs232.sh
index a34ffb8..355feef 100755
--- a/target/test/test_rs232.sh
+++ b/target/test/test_rs232.sh
@@ -27,7 +27,19 @@ echo_jumper_help()
 	elif [ "$1" == "APF51" ]; then
 		echo " (Pin 2 & 3 of RS-232 connector)"
 	elif [ "$1" == "APF28" ]; then
-		echo " (Pin 21 & 23 and 25 & 27 of j9 connector)"
+		if [ "$2" == "0" ]; then
+			echo " (Pin 21 & 23 (Rx/Tx) and 25 & 27 (CTS/RTS) of J9 connector)"
+		elif [ "$2" == "1" ]; then
+			echo " (Pin 26 & 28 (Rx/Tx) and 22 & 24 (CTS/RTS) of J9 connector)"
+		elif [ "$2" == "2" ]; then
+			echo " (Pin 12 & 14 (Rx/Tx) and 16 & 18 (CTS/RTS) of J9 connector)"
+		elif [ "$2" == "3" ]; then
+			echo " (Pin 11 & 13 (Rx/Tx) and 15 & 17 (CTS/RTS) of J9 connector)"
+		elif [ "$2" == "4" ]; then
+			echo " (Pin 14 & 16 (Rx/Tx) and 18 & 20 (CTS/RTS) of J10 connector)"
+		else
+			echo " (No consign yet for this port)"
+		fi
 	else
 		echo "Platform not supported by this test"
 	fi
@@ -43,7 +55,7 @@ test_serial_port()
 	stty -F $SERIAL_DEVICE -echo
 	if [ "$?" == 0 ]; then
 		echo -n "Connect loopback jumper"
-		execute_for_target echo_jumper_help
+		execute_for_target echo_jumper_help $1
 		ask_user "and then press <ENTER>"
 		# Configure port as raw
 		stty -F $SERIAL_DEVICE raw
@@ -71,15 +83,15 @@ test_serial_port()
 
 configure_ports_devices()
 {
-	LINUX_VERSION=`uname -r`
+	LINUX_VERSION=`uname -r | cut -d . -f 1-3`
 	if [ "$1" == "APF9328" ]; then
-		if [ "$LINUX_VERSION" == "2.6.29.6" ]; then
+		if [ "$LINUX_VERSION" == "2.6.29" ]; then
 			SERIAL_DEVICES="/dev/ttySMX"
 		else
 			SERIAL_DEVICES="/dev/ttymxc"
 		fi
 	elif [ "$1" == "APF27" ]; then
-		if [ "$LINUX_VERSION" == "2.6.29.6" ]; then
+		if [ "$LINUX_VERSION" == "2.6.29" ]; then
 			SERIAL_DEVICES="/dev/ttySMX"
 		else
 			SERIAL_DEVICES="/dev/ttymxc"
@@ -87,7 +99,7 @@ configure_ports_devices()
 	elif [ "$1" == "APF51" ]; then
 		SERIAL_DEVICES="/dev/ttymxc"
 	elif [ "$1" == "APF28" ]; then
-		if [ "$LINUX_VERSION" == "2.6.35.3" ]; then
+		if [ "$LINUX_VERSION" == "2.6.35" ]; then
 			SERIAL_DEVICES="/dev/ttySP"
 		else
 			SERIAL_DEVICES="/dev/ttyAPP"
diff --git a/target/test/test_usb_host.sh b/target/test/test_usb_host.sh
index 87df2d3..17279ad 100755
--- a/target/test/test_usb_host.sh
+++ b/target/test/test_usb_host.sh
@@ -76,7 +76,7 @@ test_usb_host()
 		check_usb_key
 		wait_key_removal
 
-		wait_key_insertion "the mini"
+		wait_key_insertion "the mini USB OTG set as"
 		check_usb_key
 		wait_key_removal
 	else


hooks/post-receive
-- 
armadeus