[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-729-gfc78ad8
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-729-gfc78ad8
|
From: Julien B a. A. <ar...@us...> - 2015-04-29 13:34:10
|
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 fc78ad85435266184d74b96f9900a9e172cde2fc (commit)
via 11d659720a5ad4e94b57ada53498654ae67d667c (commit)
via 5d21c8ffd037eabfc51cc13063004ad12be8a5af (commit)
via 7e1ac5b35e1c8ff98af27837c1bb9952188cfc79 (commit)
via 2a785e193ef009195a5b86ccd0999821f22f2e18 (commit)
via c0a69c33746ec27d37706905b3dff7f1eb816a65 (commit)
from 36f64611ad86152425bed0fb1ff0fb3c62b7ee87 (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 fc78ad85435266184d74b96f9900a9e172cde2fc
Author: Julien Boibessot <jul...@ar...>
Date: Wed Apr 29 15:33:38 2015 +0200
[TEST] fpga: better user instructions
commit 11d659720a5ad4e94b57ada53498654ae67d667c
Author: Julien Boibessot <jul...@ar...>
Date: Wed Apr 29 15:32:59 2015 +0200
[TEST] gpio: uses gpio-led on APF51 as heartbeat prevent anything else by default
commit 5d21c8ffd037eabfc51cc13063004ad12be8a5af
Author: Julien Boibessot <jul...@ar...>
Date: Wed Apr 29 15:31:46 2015 +0200
[TEST] pwm: add better instruction for APF51
commit 7e1ac5b35e1c8ff98af27837c1bb9952188cfc79
Author: Julien Boibessot <jul...@ar...>
Date: Wed Apr 29 15:31:13 2015 +0200
[TEST] rs232: add regexpr to find devices and fixes test on APF51
commit 2a785e193ef009195a5b86ccd0999821f22f2e18
Author: Julien Boibessot <jul...@ar...>
Date: Wed Apr 29 15:30:07 2015 +0200
[TEST] Wi-Fi: down eth0 before test to be sure that wlan is used for transfer test + better user instructions.
commit c0a69c33746ec27d37706905b3dff7f1eb816a65
Author: Julien Boibessot <jul...@ar...>
Date: Wed Apr 29 15:13:27 2015 +0200
[TEST] Add test script for lighttpd
-----------------------------------------------------------------------
Summary of changes:
.../packages/{test_boa.sh => test_lighttpd.sh} | 43 ++++++++++++++------
target/test/test_fpga.sh | 7 ++-
target/test/test_gpio.sh | 7 ++-
target/test/test_pwm.sh | 5 ++
target/test/test_release.sh | 1 +
target/test/test_rs232.sh | 28 +++++++++----
target/test/test_wifi.sh | 6 +-
7 files changed, 66 insertions(+), 31 deletions(-)
copy target/test/packages/{test_boa.sh => test_lighttpd.sh} (59%)
diff --git a/target/test/packages/test_boa.sh b/target/test/packages/test_lighttpd.sh
similarity index 59%
copy from target/test/packages/test_boa.sh
copy to target/test/packages/test_lighttpd.sh
index 6ef1e77..c0a3a6a 100755
--- a/target/test/packages/test_boa.sh
+++ b/target/test/packages/test_lighttpd.sh
@@ -3,7 +3,7 @@
#
# Script to test a Buildroot package for Armadeus Software release
#
-# Copyright (C) 2008 The Armadeus Project
+# Copyright (C) 2008-2015 The Armadeus Project
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -15,50 +15,68 @@ source ./test_helpers.sh
source ./test_env.sh
#DEBUG=True
-EXEC_NAME="boa"
-HTML_DIR="/var/www"
+EXEC_NAME="lighttpd"
+HTML_DIR="/var/www/servers/www.example.org/pages/"
HTML_FILE="$HTML_DIR/index.html"
-BOA_LOG_DIR="/var/log/boa"
+CONFIG="/root/lighttpd.conf"
+HTML_PORT=3000
+BOARD=`cat /etc/machine`
generate_html_test_file()
{
cat << EOF > $HTML_FILE
<html>
<head>
- <title> Test of Boa Web Server </title>
+ <title> Test of $EXEC_NAME Web Server </title>
</head>
<body>
- <h1> If you can read that, then the test is OK ! ;-) </h1>
+ <h1> If you can read that, then the test on your $BOARD is OK ! ;-) </h1>
</body>
</html>
EOF
}
+generate_lighttpd_config_file()
+{
+ cat << EOF > $CONFIG
+server.document-root = "/var/www/servers/www.example.org/pages/"
+
+server.port = $HTML_PORT
+
+mimetype.assign = (
+ ".html" => "text/html",
+ ".txt" => "text/plain",
+ ".jpg" => "image/jpeg",
+ ".png" => "image/png"
+)
+EOF
+}
+
test_cleanup()
{
rm -f "$HTML_FILE"
killall $EXEC_NAME
}
-test_boa()
+test_lighttpd()
{
- show_test_banner "Boa"
+ show_test_banner "Lighttpd"
is_package_installed $EXEC_NAME
if [ "$?" == 0 ]; then
mkdir -p $HTML_DIR
- mkdir -p $BOA_LOG_DIR
grep armadeus /etc/hosts | grep 127.0.0.1
if [ "$?" != 0 ]; then
echo "127.0.0.1 `cat /etc/hostname`" >> /etc/hosts
fi
generate_html_test_file
+ generate_lighttpd_config_file
IP=`ifconfig eth0 | grep "inet addr" | cut -d ":" -f 2 | cut -d " " -f 1`
# Launch it
- $EXEC_NAME
+ $EXEC_NAME -f $CONFIG
#
- echo "Now you can access to http://"$IP"/index.html from your web browser"
+ echo "Now you can access to http://"$IP":"$HTML_PORT"/index.html from your Host PC Web browser"
sleep 8
if [ "$?" == 0 ]; then
ask_user "Did you manage to show the web page ? (y/N)"
@@ -73,5 +91,4 @@ test_boa()
exit_failed
}
-test_boa
-
+test_lighttpd
diff --git a/target/test/test_fpga.sh b/target/test/test_fpga.sh
index bf22000..0321b17 100755
--- a/target/test/test_fpga.sh
+++ b/target/test/test_fpga.sh
@@ -3,7 +3,7 @@
#
# Script to test Armadeus Software release
#
-# Copyright (C) 2008-2012 The Armadeus Project - Armadeus systems
+# Copyright (C) 2008-2015 The Armadeus Project - Armadeus systems
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -21,11 +21,12 @@ load_led()
load_fpga $BITFILE_DIR/blinking_led_apf9328_200k.bit
RES=$?
elif [ "$1" == "APF27" ]; then
- ask_user "Please connect pins 1 & 39 of J20 connector (3,3V supply for FPGA bank)\nThen press enter"
+ ask_user "Please connect pins 1 & 39 of J20 connector\
+ (3,3V supply for FPGA bank)\nThen press ENTER"
load_fpga $BITFILE_DIR/blinking_led_apf27_200k.bit
RES=$?
elif [ "$1" == "APF51" ]; then
- ask_user "Please power on FPGA Bank 1\nThen press enter"
+ ask_user "Please power on FPGA Bank 1\nThen press ENTER"
load_fpga $BITFILE_DIR/top_wishbone_example_apf51_lx9.bin
RES=$?
if [ "$RES" == 0 ]; then
diff --git a/target/test/test_gpio.sh b/target/test/test_gpio.sh
index d37d76e..448be7c 100755
--- a/target/test/test_gpio.sh
+++ b/target/test/test_gpio.sh
@@ -22,7 +22,7 @@ load_module()
echo "Module failed to load"
exit_failed
fi
- elif [ "$1" == "APF51" ] || [ "$1" == "APF28" ]; then
+ elif [ "$1" == "APF51" ] || [ "$1" == "APF28" ] || [ "$1" == "APF6" ]; then
echo
else
echo "Platform not supported by this test"
@@ -34,7 +34,7 @@ unload_module()
{
if [ "$1" == "APF9328" ] || [ "$1" == "APF27" ]; then
rmmod gpio
- elif [ "$1" == "APF51" ] || [ "$1" == "APF28" ]; then
+ elif [ "$1" == "APF51" ] || [ "$1" == "APF28" ] || [ "$1" == "APF6" ]; then
echo
else
echo "Platform not supported by this test"
@@ -50,11 +50,11 @@ blink_led_gpiolib()
fi
LED="$1"
echo $LED > /sys/class/gpio/export
- ls /sys/class/gpio/gpio$LED/
if [ "$?" != 0 ]; then
echo "Failed to export GPIO $LED"
return
fi
+ ls /sys/class/gpio/gpio$LED/
echo out > /sys/class/gpio/gpio$LED/direction
for i in `seq 0 5`; do
@@ -122,6 +122,7 @@ blink_led()
elif [ "$1" == "APF51" ]; then
LED_NAME="i.MX"
blink_led_gpiolib 2
+ blink_led_gpioled apfdev\:green\:user
elif [ "$1" == "APF28" ]; then
blink_led_gpioled apfdev\:green\:user
else
diff --git a/target/test/test_pwm.sh b/target/test/test_pwm.sh
index f553de2..f265b72 100755
--- a/target/test/test_pwm.sh
+++ b/target/test/test_pwm.sh
@@ -31,6 +31,11 @@ load_driver()
modprobe imx-pwm
if [ ! -d "$SYS_DIR" ]; then
echo "can't find /sys/ interface"
+ if [ "$1" == "APF51" ]; then
+ echo -e "On APF51, PWM is multiplexed with i.MX \
+LED so you can't have both\nwith default\
+ kernel"
+ fi
exit_failed
fi
elif [ "$1" == "APF28" ]; then
diff --git a/target/test/test_release.sh b/target/test/test_release.sh
index ae7e9a7..4ea1bbe 100755
--- a/target/test/test_release.sh
+++ b/target/test/test_release.sh
@@ -70,6 +70,7 @@ $THIS_DIR/media_perf.sh --mode=speed
rm /tmp/data.bin
echo
$THIS_DIR/test_wifi.sh
+ifconfig eth0 up # Wi-Fi test has down eth0
# Following tests needs Internet access:
ask_user "I will now try to configure Internet access. Press ENTER when ready"
$THIS_DIR/dhcp.sh
diff --git a/target/test/test_rs232.sh b/target/test/test_rs232.sh
index 6e93889..692a2b0 100755
--- a/target/test/test_rs232.sh
+++ b/target/test/test_rs232.sh
@@ -25,7 +25,13 @@ echo_jumper_help()
elif [ "$1" == "APF27" ]; then
echo " (Pin 2 & 3 of J21 connector (between RS and J8))"
elif [ "$1" == "APF51" ]; then
- echo " (Pin 2 & 3 of RS-232 connector)"
+ if [ "$2" == "0" ]; then
+ echo
+ echo " (Pin 2 & 3 of RS-232 connector \ o x x o o /)"
+ echo " \ o o o o /"
+ else
+ echo " (No consign yet for this port)"
+ fi
elif [ "$1" == "APF28" ]; then
if [ "$2" == "0" ]; then
echo " (Pin 21 & 23 (Rx/Tx) and 25 & 27 (CTS/RTS) of J9 connector)"
@@ -85,24 +91,28 @@ configure_ports_devices()
{
LINUX_VERSION=`uname -r | cut -d . -f 1-3`
if [ "$1" == "APF9328" ]; then
+ REGEXPR="*"
if [ "$LINUX_VERSION" == "2.6.29" ]; then
- SERIAL_DEVICES="/dev/ttySMX*"
+ SERIAL_DEVICES="/dev/ttySMX"
else
- SERIAL_DEVICES="/dev/ttymxc*"
+ SERIAL_DEVICES="/dev/ttymxc"
fi
elif [ "$1" == "APF27" ]; then
+ REGEXPR="[!0]"
if [ "$LINUX_VERSION" == "2.6.29" ]; then
- SERIAL_DEVICES="/dev/ttySMX2"
+ SERIAL_DEVICES="/dev/ttySMX"
else
- SERIAL_DEVICES="/dev/ttymxc2"
+ SERIAL_DEVICES="/dev/ttymxc"
fi
elif [ "$1" == "APF51" ]; then
- SERIAL_DEVICES="/dev/ttymxc*"
+ REGEXPR="[!2]"
+ SERIAL_DEVICES="/dev/ttymxc"
elif [ "$1" == "APF28" ]; then
+ REGEXPR="*"
if [ "$LINUX_VERSION" == "2.6.35" ]; then
- SERIAL_DEVICES="/dev/ttySP*"
+ SERIAL_DEVICES="/dev/ttySP"
else
- SERIAL_DEVICES="/dev/ttyAPP*"
+ SERIAL_DEVICES="/dev/ttyAPP"
fi
else
echo "$1 platform not supported by this test"
@@ -119,7 +129,7 @@ HELP="NO"
if [ "$1" == "" ]; then
HELP="YES"
echo "Please give the port number to test !"
- PORTS=`ls $SERIAL_DEVICES`
+ PORTS=`ls $SERIAL_DEVICES$REGEXPR`
echo -n " Available one: [ "
for port in $PORTS; do
port_num=`echo $port | awk '{print substr($0,length($0))}'`
diff --git a/target/test/test_wifi.sh b/target/test/test_wifi.sh
index e6d86ab..e8097de 100755
--- a/target/test/test_wifi.sh
+++ b/target/test/test_wifi.sh
@@ -33,9 +33,9 @@ get_interface_name()
test_wifi()
{
- show_test_banner "WiFi (802.11 b/g)"
+ show_test_banner "Wi-Fi (802.11 b/g)"
- ask_user "This test assumes that you run a private WiFi network (WEP shared key security). Your Access Point (AP) should be connected to your Host. Press ENTER to continue"
+ ask_user "This test assumes that you run a private Wi-Fi network (WEP shared key security). \nYour Access Point (AP) should be connected to your Host. Press ENTER to continue"
if [ "$1" == "" ]; then
ask_user "Do you have an APW wireless extension board or an APF51Dev ? (Y/n)"
@@ -59,7 +59,7 @@ test_wifi()
echo "WLAN interface not available !!"
exit_failed
fi
- #ifconfig eth0 down # if connected to same network eth0 can perturbate the test
+ ifconfig eth0 down # if connected to same network eth0 can perturbate the test
# get available APs (remove hidden one)
echo -e "\n Scanning available APs"
hooks/post-receive
--
armadeus
|