[Armadeus-commitlog] SF.net SVN: armadeus:[1253] trunk

[<ar...@us...>]

Revision: 1253
          http://armadeus.svn.sourceforge.net/armadeus/?rev=1253&view=rev
Author:   artemys
Date:     2009-05-04 09:53:36 +0000 (Mon, 04 May 2009)

Log Message:
-----------
[TEST] Makes FPGA loading test run on APF9328 too

Modified Paths:
--------------
    trunk/buildroot/package/armadeus-testsuite/armadeus-tests.mk
    trunk/target/test/test_fpga.sh
    trunk/target/test/test_gpio.sh
    trunk/target/test/test_helpers.sh

Added Paths:
-----------
    trunk/target/test/data/
    trunk/target/test/data/fpga

Modified: trunk/buildroot/package/armadeus-testsuite/armadeus-tests.mk
===================================================================
--- trunk/buildroot/package/armadeus-testsuite/armadeus-tests.mk	2009-05-01 13:31:39 UTC (rev 1252)
+++ trunk/buildroot/package/armadeus-testsuite/armadeus-tests.mk	2009-05-04 09:53:36 UTC (rev 1253)
@@ -9,23 +9,24 @@
 ARMADEUS-TESTSUITE_DIR:=$(BUILD_DIR)/armadeus-testsuite-$(ARMADEUS-TESTSUITE_VER)
 ARMADEUS-TESTSUITE_CAT:=zcat
 ARMADEUS-TESTSUITE_BINARY:=test_env.sh
-ARMADEUS-TESTSUITE_TARGET_DIR:=/usr/bin/testsuite
+ARMADEUS-TESTSUITE_TARGET_DIR:=$(TARGET_DIR)/usr/bin/testsuite
 ARMADEUS-TESTSUITE_TARGET_BINARY:=$(ARMADEUS-TESTSUITE_TARGET_DIR)/$(ARMADEUS-TESTSUITE_BINARY)
 
 $(ARMADEUS-TESTSUITE_DIR)/.unpacked:
 	mkdir -p $(ARMADEUS-TESTSUITE_DIR)/
-	cp -r $(ARMADEUS-TESTSUITE_SOURCE)/* $(ARMADEUS-TESTSUITE_DIR)/
+	cp -prL $(ARMADEUS-TESTSUITE_SOURCE)/* $(ARMADEUS-TESTSUITE_DIR)/
 	touch $@
 
-$(TARGET_DIR)/$(ARMADEUS-TESTSUITE_TARGET_BINARY): $(ARMADEUS-TESTSUITE_DIR)/.unpacked
-	mkdir -p $(TARGET_DIR)/$(ARMADEUS-TESTSUITE_TARGET_DIR)
-	find $(ARMADEUS-TESTSUITE_DIR) -name "*.sh" -exec install -D {} $(TARGET_DIR)/$(ARMADEUS-TESTSUITE_TARGET_DIR) \;
+$(ARMADEUS-TESTSUITE_TARGET_BINARY): $(ARMADEUS-TESTSUITE_DIR)/.unpacked
+	mkdir -p $(ARMADEUS-TESTSUITE_TARGET_DIR)
+	find $(ARMADEUS-TESTSUITE_DIR) -name "*.sh" -exec install -D {} $(ARMADEUS-TESTSUITE_TARGET_DIR) \;
+	cp -r $(ARMADEUS-TESTSUITE_DIR)/data $(ARMADEUS-TESTSUITE_TARGET_DIR)/
 	touch $@
 
-armadeus-testsuite: $(TARGET_DIR)/$(ARMADEUS-TESTSUITE_TARGET_BINARY)
+armadeus-testsuite: $(ARMADEUS-TESTSUITE_TARGET_BINARY)
 
 armadeus-testsuite-clean:
-	rm -rf $(TARGET_DIR)/$(ARMADEUS-TESTSUITE_TARGET_DIR)
+	rm -rf $(ARMADEUS-TESTSUITE_TARGET_DIR)
 
 armadeus-testsuite-dirclean:
 	rm -rf $(ARMADEUS-TESTSUITE_DIR)

Added: trunk/target/test/data/fpga
===================================================================
--- trunk/target/test/data/fpga	                        (rev 0)
+++ trunk/target/test/data/fpga	2009-05-04 09:53:36 UTC (rev 1253)
@@ -0,0 +1 @@
+link ../../../firmware/leds/blinking_led/bin/
\ No newline at end of file


Property changes on: trunk/target/test/data/fpga
___________________________________________________________________
Added: svn:special
   + *

Modified: trunk/target/test/test_fpga.sh
===================================================================
--- trunk/target/test/test_fpga.sh	2009-05-01 13:31:39 UTC (rev 1252)
+++ trunk/target/test/test_fpga.sh	2009-05-04 09:53:36 UTC (rev 1253)
@@ -17,22 +17,33 @@
 FPGA_LOAD_DEV="/dev/fpgaloader"
 TEST_BITFILE=/tmp/led.bit
 
+
+load_apf9328()
+{
+	dd if=./data/fpga/blinking_led_apf9328_200k.bit of=$FPGA_LOAD_DEV
+}
+
+load_apf27()
+{
+        dd if=./data/fpga/blinking_led_apf27_200k.bit of=$FPGA_LOAD_DEV
+}
+
 test_fpga_load()
 {
 	show_test_banner "FPGA"
 
 	modprobe fpgaloader
-	if [ "$?" != 0 ] || [ ! -c "$FPGA_LOAD_DEV" ] ; then
+	RES=$?
+	sleep 1
+	if [ "$RES" != 0 ] || [ ! -c "$FPGA_LOAD_DEV" ] ; then
 		echo "Module failed to load"
 		exit_failed
 	fi
 
 	cat /proc/driver/fpga/loader
-	echo "Downloading bitfile from Internet"
-	# Suppose that network was correctly set before
-	wget http://dl.free.fr/ppbCdFTqs -O $TEST_BITFILE
+
+	execute_for_target load_apf9328 load_apf27
 	
-	dd if=$TEST_BITFILE of=$FPGA_LOAD_DEV
 	if [ "$?" == 0 ]; then
 		ask_user "Did you see the LED on FPGA ? (y/n)"
 		if [ "$response" == "y" ]; then

Modified: trunk/target/test/test_gpio.sh
===================================================================
--- trunk/target/test/test_gpio.sh	2009-05-01 13:31:39 UTC (rev 1252)
+++ trunk/target/test/test_gpio.sh	2009-05-04 09:53:36 UTC (rev 1253)
@@ -49,13 +49,7 @@
 		exit_failed
 	fi
 
-	BOARD=`cat /etc/machine`
-	if [ "$BOARD" == "APF9328" ]; then
-		blink_led_apf9328
-	fi
-	if [ "$BOARD" == "APF27" ]; then
-		blink_led_apf27
-	fi
+	execute_for_target blink_led_apf9328 blink_led_apf27
 
 	ask_user "Did you see a LED blinking ? (y/n)"
 	if [ "$response" != "y" ]; then

Modified: trunk/target/test/test_helpers.sh
===================================================================
--- trunk/target/test/test_helpers.sh	2009-05-01 13:31:39 UTC (rev 1252)
+++ trunk/target/test/test_helpers.sh	2009-05-04 09:53:36 UTC (rev 1253)
@@ -93,3 +93,13 @@
 	sleep 1
 }
 
+execute_for_target()
+{
+	BOARD=`cat /etc/machine`
+	if [ "$BOARD" == "APF9328" ] && [ "$1" != "" ]; then
+                $1
+        fi
+        if [ "$BOARD" == "APF27" ] && [ "$2" != "" ]; then
+                $2
+        fi
+}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.