[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-573-gab99d5b

[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  ab99d5bec78d466a999a966ef1d5cd8157bb6632 (commit)
      from  a2ad94b627946175314567664c95c29b57e0d3e1 (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 ab99d5bec78d466a999a966ef1d5cd8157bb6632
Author: Julien Boibessot <jul...@ar...>
Date:   Fri Jul 30 15:38:51 2010 +0200

    [TEST] Updates scripts for 3.3 release

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

Summary of changes:
 target/test/packages/test_madplay.sh   |    4 ++--
 target/test/packages/test_sdl.sh       |    2 +-
 target/test/packages/test_slideshow.sh |    2 +-
 target/test/test_audio.sh              |    6 +++---
 target/test/test_pwm.sh                |    2 +-
 target/test/test_release.sh            |    2 ++
 6 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/target/test/packages/test_madplay.sh b/target/test/packages/test_madplay.sh
index e8c1c00..1bd7c9a 100755
--- a/target/test/packages/test_madplay.sh
+++ b/target/test/packages/test_madplay.sh
@@ -18,7 +18,7 @@ source ./test_env.sh
 # Requires: ALSA & Internet access
 #DEBUG=True
 EXEC_NAME="madplay"
-FILE_WEB_ADDRESS="http://www.armadeus.com//assos_downloads/misc/mozart.mp3"
+FILE_WEB_ADDRESS="http://www.armadeus.com/assos_downloads/misc/mozart.mp3"
 MUSIC_FILE_NAME="$TEMP_DIR/mozart.mp3"
 
 test_madplay()
@@ -47,11 +47,11 @@ test_madplay()
 	if [ "$?" == 0 ]; then
 		sleep 10
 		ask_user "Was music correctly played ? (y/N)"
+		kill $PID
 		if [ "$response" == "y" ] || [ "$response" == "yes" ]; then
 			echo_test_ok
 			exit 0
 		fi
-		kill $PID
 	fi
 
 	exit_failed
diff --git a/target/test/packages/test_sdl.sh b/target/test/packages/test_sdl.sh
index 9828c50..441cc14 100755
--- a/target/test/packages/test_sdl.sh
+++ b/target/test/packages/test_sdl.sh
@@ -36,7 +36,7 @@ test_sdlwater()
 		$EXEC_NAME /usr/share/images/water320.bmp 1>/dev/null &
 		echo "Please touch the LCD screen"
 		sleep 5
-		ask_user "Did you manage to draw water circles ? (y/N)"
+		ask_user "Did you manage to draw circles in water ? (y/N)"
 		if [ "$response" == "y" ] || [ "$response" == "yes" ]; then
 			echo_test_ok
 			test_cleanup
diff --git a/target/test/packages/test_slideshow.sh b/target/test/packages/test_slideshow.sh
index 710a7c0..8279b65 100755
--- a/target/test/packages/test_slideshow.sh
+++ b/target/test/packages/test_slideshow.sh
@@ -17,7 +17,7 @@ source ./test_env.sh
 # Requires: test_sdl.sh
 # Validates: libpng & slideshow
 EXEC_NAME="slideshow"
-TEST_FILE="../data/images/"
+TEST_DIR="../data/images/"
 
 test_slideshow()
 {
diff --git a/target/test/test_audio.sh b/target/test/test_audio.sh
index e40b2ca..dbc0c21 100755
--- a/target/test/test_audio.sh
+++ b/target/test/test_audio.sh
@@ -54,9 +54,9 @@ test_audio()
 
 	execute_for_target end_of_test_for_apf9328 continue_for_apf27
 
-	ask_user "Please connect a microphone to the Audio In connector (bottom on APF27). Then press ENTER."
-	amixer cset numid=6 on
-	amixer cset numid=5 30
+	ask_user "Please connect a microphone to the Audio In connector (bottom one on APF27). Then press ENTER."
+	amixer cset numid=7 on
+	amixer cset numid=6 30
 	ask_user "You will now have to speak in the MIC. The sampled sound will then be played back. Press ENTER when ready to speak."
 	# Stereo 16bits @ 16KHz
 	arecord -r 16000 -f S16_LE -c 2 $TEMP_FILE & pid=$!
diff --git a/target/test/test_pwm.sh b/target/test/test_pwm.sh
index 89ca840..1f72d99 100755
--- a/target/test/test_pwm.sh
+++ b/target/test/test_pwm.sh
@@ -33,7 +33,7 @@ prepare_test_for_apf9328()
 
 prepare_test_for_apf27()
 {
-	ask_user "Please connect your oscilloscope probe to pin 4 of J22 connector, then press ENTER when ready"
+	ask_user "Please connect your oscilloscope probe to pin 4 of J22 connector (GND is on pin 6 or 40), then press ENTER when ready"
 }
 
 test_pwm()
diff --git a/target/test/test_release.sh b/target/test/test_release.sh
index 826a9a0..bd169f9 100755
--- a/target/test/test_release.sh
+++ b/target/test/test_release.sh
@@ -67,6 +67,8 @@ $THIS_DIR/test_pwm.sh
 echo
 $THIS_DIR/media_perf.sh speed
 rm /tmp/data.bin
+echo
+$THIS_DIR/test_wifi.sh
 # Following tests needs Internet access:
 ask_user "I will now try to configure Internet access. Press ENTER when ready"
 $THIS_DIR/dhcp.sh


hooks/post-receive
-- 
armadeus