Improve BoardDriverTest build test so that it will work regardless of native line...

diff --git a/BuildTests/BoardDriverTest/BoardDeviceMap.cfg b/BuildTests/BoardDriverTest/BoardDeviceMap.cfg
index 8d08549..27eaae9 100644 (file)
--- a/BuildTests/BoardDriverTest/BoardDeviceMap.cfg
+++ b/BuildTests/BoardDriverTest/BoardDeviceMap.cfg
@@ -1,49 +1,49 @@
-# BOARD DEFINE = {ARCH} : {MCU}\r
-BOARD_USBKEY = avr8 : at90usb1287\r
-BOARD_STK525 = avr8 : at90usb647\r
-BOARD_STK526 = avr8 : at90usb162\r
-BOARD_RZUSBSTICK = avr8 : at90usb1287\r
-BOARD_ATAVRUSBRF01 = avr8 : at90usb1287\r
-BOARD_BUMBLEB = avr8 : at90usb162\r
-BOARD_XPLAIN = avr8 : at90usb1287\r
-BOARD_XPLAIN_REV1 = avr8 : at90usb1287\r
-BOARD_EVK527 = avr8 : atmega32u4\r
-BOARD_TEENSY = avr8 : at90usb162\r
-BOARD_USBTINYMKII = avr8 : at90usb162\r
-BOARD_BENITO = avr8 : at90usb162\r
-BOARD_JMDBU2 = avr8 : atmega32u2\r
-BOARD_OLIMEX162 = avr8 : at90usb162\r
-BOARD_UDIP = avr8 : atmega32u2\r
-BOARD_BUI = avr8 : at90usb646\r
-BOARD_UNO = avr8 : atmega8u2\r
-BOARD_CULV3 = avr8 : atmega32u4\r
-BOARD_BLACKCAT = avr8 : at90usb162\r
-BOARD_MAXIMUS = avr8 : at90usb162\r
-BOARD_MINIMUS = avr8 : atmega32u2\r
-BOARD_ADAFRUITU4 = avr8 : atmega32u4\r
-BOARD_MICROSIN162 = avr8 : atmega162\r
-BOARD_USBFOO = avr8 : atmega162\r
-BOARD_SPARKFUN8U2 = avr8 : atmega8u2\r
-BOARD_EVK1101 = uc3 : uc3b0256\r
-BOARD_TUL = avr8 : atmega32u4\r
-BOARD_EVK1100 = uc3 : uc3a0512\r
-BOARD_EVK1104 = uc3 : uc3a3256\r
-BOARD_A3BU_XPLAINED = xmega : atxmega256a3bu\r
-BOARD_TEENSY2 = avr8 : at90usb646\r
-BOARD_USB2AX = avr8 : atmega32u4\r
-BOARD_USB2AX_V3 = avr8 : atmega32u4\r
-BOARD_MICROPENDOUS_32U2 = avr8 : atmega32u2\r
-BOARD_MICROPENDOUS_A = avr8 : at90usb1287\r
-BOARD_MICROPENDOUS_1 = avr8 : at90usb162\r
-BOARD_MICROPENDOUS_2 = avr8 : atmega32u4\r
-BOARD_MICROPENDOUS_3 = avr8 : at90usb1287\r
-BOARD_MICROPENDOUS_4 = avr8 : at90usb1287\r
-BOARD_MICROPENDOUS_DIP = avr8 : at90usb1287\r
-BOARD_MICROPENDOUS_REV1 = avr8 : at90usb1287\r
-BOARD_MICROPENDOUS_REV2 = avr8 : at90usb1287\r
-BOARD_B1_XPLAINED = xmega : atxmega128b1\r
-BOARD_MULTIO = avr8 : at90usb162\r
-BOARD_BIGMULTIO = avr8 : atmega32u4\r
-BOARD_DUCE = avr8 : atmega32u2\r
-BOARD_OLIMEX32U4 = avr8 : atmega32u4\r
-BOARD_OLIMEXT32U4 = avr8 : atmega32u4
\ No newline at end of file
+# BOARD DEFINE = {ARCH} : {MCU} :\r
+BOARD_USBKEY = avr8 : at90usb1287 :\r
+BOARD_STK525 = avr8 : at90usb647 :\r
+BOARD_STK526 = avr8 : at90usb162 :\r
+BOARD_RZUSBSTICK = avr8 : at90usb1287 :\r
+BOARD_ATAVRUSBRF01 = avr8 : at90usb1287 :\r
+BOARD_BUMBLEB = avr8 : at90usb162 :\r
+BOARD_XPLAIN = avr8 : at90usb1287 :\r
+BOARD_XPLAIN_REV1 = avr8 : at90usb1287 :\r
+BOARD_EVK527 = avr8 : atmega32u4 :\r
+BOARD_TEENSY = avr8 : at90usb162 :\r
+BOARD_USBTINYMKII = avr8 : at90usb162 :\r
+BOARD_BENITO = avr8 : at90usb162 :\r
+BOARD_JMDBU2 = avr8 : atmega32u2 :\r
+BOARD_OLIMEX162 = avr8 : at90usb162 :\r
+BOARD_UDIP = avr8 : atmega32u2 :\r
+BOARD_BUI = avr8 : at90usb646 :\r
+BOARD_UNO = avr8 : atmega8u2 :\r
+BOARD_CULV3 = avr8 : atmega32u4 :\r
+BOARD_BLACKCAT = avr8 : at90usb162 :\r
+BOARD_MAXIMUS = avr8 : at90usb162 :\r
+BOARD_MINIMUS = avr8 : atmega32u2 :\r
+BOARD_ADAFRUITU4 = avr8 : atmega32u4 :\r
+BOARD_MICROSIN162 = avr8 : atmega162 :\r
+BOARD_USBFOO = avr8 : atmega162 :\r
+BOARD_SPARKFUN8U2 = avr8 : atmega8u2 :\r
+BOARD_EVK1101 = uc3 : uc3b0256 :\r
+BOARD_TUL = avr8 : atmega32u4 :\r
+BOARD_EVK1100 = uc3 : uc3a0512 :\r
+BOARD_EVK1104 = uc3 : uc3a3256 :\r
+BOARD_A3BU_XPLAINED = xmega : atxmega256a3bu :\r
+BOARD_TEENSY2 = avr8 : at90usb646 :\r
+BOARD_USB2AX = avr8 : atmega32u4 :\r
+BOARD_USB2AX_V3 = avr8 : atmega32u4 :\r
+BOARD_MICROPENDOUS_32U2 = avr8 : atmega32u2 :\r
+BOARD_MICROPENDOUS_A = avr8 : at90usb1287 :\r
+BOARD_MICROPENDOUS_1 = avr8 : at90usb162 :\r
+BOARD_MICROPENDOUS_2 = avr8 : atmega32u4 :\r
+BOARD_MICROPENDOUS_3 = avr8 : at90usb1287 :\r
+BOARD_MICROPENDOUS_4 = avr8 : at90usb1287 :\r
+BOARD_MICROPENDOUS_DIP = avr8 : at90usb1287 :\r
+BOARD_MICROPENDOUS_REV1 = avr8 : at90usb1287 :\r
+BOARD_MICROPENDOUS_REV2 = avr8 : at90usb1287 :\r
+BOARD_B1_XPLAINED = xmega : atxmega128b1 :\r
+BOARD_MULTIO = avr8 : at90usb162 :\r
+BOARD_BIGMULTIO = avr8 : atmega32u4 :\r
+BOARD_DUCE = avr8 : atmega32u2 :\r
+BOARD_OLIMEX32U4 = avr8 : atmega32u4 :\r
+BOARD_OLIMEXT32U4 = avr8 : atmega32u4 :
\ No newline at end of file

diff --git a/BuildTests/BoardDriverTest/makefile b/BuildTests/BoardDriverTest/makefile
index e0e784d..5fffe1c 100644 (file)
--- a/BuildTests/BoardDriverTest/makefile
+++ b/BuildTests/BoardDriverTest/makefile
@@ -32,19 +32,20 @@ testboards:
        echo "buildtest:" > BuildMakefile\r
        @while read line; \\r
         do \\r
        echo "buildtest:" > BuildMakefile\r
        @while read line; \\r
         do \\r

-          build_cfg=`grep "$$line " BoardDeviceMap.cfg | cut -d'=' -f2-`; \\r
+          build_cfg=`grep "$$line " BoardDeviceMap.cfg | sed 's/ //g' | cut -d'=' -f2-`; \\r

           \\r
           build_board=$$line; \\r
           \\r
           build_board=$$line; \\r

-          build_arch=`echo $$build_cfg | cut -d':' -f1 | cut -d' ' -f1`; \\r
-          build_mcu=`echo $$build_cfg | cut -d':' -f2 | cut -d' ' -f2`; \\r
+          build_arch=`echo $$build_cfg | cut -d':' -f1`; \\r
+          build_mcu=`echo $$build_cfg | cut -d':' -f2`; \\r

           \\r
           if ( test -z "$$build_cfg" ); then \\r
             echo "No matching information set for board $$build_board"; \\r
           else \\r
           \\r
           if ( test -z "$$build_cfg" ); then \\r
             echo "No matching information set for board $$build_board"; \\r
           else \\r

-            echo "Found board configuration for $$build_board ($$build_arch, $$build_mcu)"; \\r
+            echo "Found board configuration for $$build_board - $$build_arch, $$build_mcu"; \\r
+                \\r

                 printf "\t@echo Building dummy project for $$build_board...\n" >> BuildMakefile; \\r
                 printf "\t@echo Building dummy project for $$build_board...\n" >> BuildMakefile; \\r

-                printf "\tmake -s -f makefile.$$build_arch clean\n" >> BuildMakefile; \\r
-                printf "\tmake -s -f makefile.$$build_arch MCU=$$build_mcu BOARD=$$build_board\n\n" >> BuildMakefile; \\r
+                printf "\tmake -s -f makefile.%s clean\n" $$build_arch >> BuildMakefile; \\r
+                printf "\tmake -s -f makefile.%s MCU=%s BOARD=%s\n\n" $$build_arch $$build_mcu $$build_board >> BuildMakefile; \\r

           fi; \\r
         done < BoardList.txt\r
         $(MAKE) -f BuildMakefile buildtest\r
           fi; \\r
         done < BoardList.txt\r
         $(MAKE) -f BuildMakefile buildtest\r