Speed up build tests by only building each test to the ELF output stage (when all...

diff --git a/BuildTests/BoardDriverTest/BoardDeviceMap.cfg b/BuildTests/BoardDriverTest/BoardDeviceMap.cfg
index 27eaae9..683b181 100644 (file)
--- a/BuildTests/BoardDriverTest/BoardDeviceMap.cfg
+++ b/BuildTests/BoardDriverTest/BoardDeviceMap.cfg
@@ -1,4 +1,6 @@
 # BOARD DEFINE = {ARCH} : {MCU} :\r
 # BOARD DEFINE = {ARCH} : {MCU} :\r

+BOARD_USER = avr8 : at90usb1287 :\r
+BOARD_NONE = avr8 : at90usb1287 :\r

 BOARD_USBKEY = avr8 : at90usb1287 :\r
 BOARD_STK525 = avr8 : at90usb647 :\r
 BOARD_STK526 = avr8 : at90usb162 :\r
 BOARD_USBKEY = avr8 : at90usb1287 :\r
 BOARD_STK525 = avr8 : at90usb647 :\r
 BOARD_STK526 = avr8 : at90usb162 :\r

diff --git a/BuildTests/BoardDriverTest/makefile b/BuildTests/BoardDriverTest/makefile
index 5fffe1c..598d953 100644 (file)
--- a/BuildTests/BoardDriverTest/makefile
+++ b/BuildTests/BoardDriverTest/makefile
@@ -30,6 +30,7 @@ makeboardlist:
        \r
 testboards:\r
        echo "buildtest:" > BuildMakefile\r
        \r
 testboards:\r
        echo "buildtest:" > BuildMakefile\r

+       \r

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


@@ -45,9 +46,10 @@ testboards:
                 \\r
                 printf "\t@echo Building dummy project for $$build_board...\n" >> BuildMakefile; \\r
                 printf "\tmake -s -f makefile.%s clean\n" $$build_arch >> BuildMakefile; \\r
                 \\r
                 printf "\t@echo Building dummy project for $$build_board...\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
+                printf "\tmake -s -f makefile.%s MCU=%s BOARD=%s elf\n\n" $$build_arch $$build_mcu $$build_board >> BuildMakefile; \\r

           fi; \\r
         done < BoardList.txt\r
           fi; \\r
         done < BoardList.txt\r

+        \r

         $(MAKE) -f BuildMakefile buildtest\r
 \r
 clean:\r
         $(MAKE) -f BuildMakefile buildtest\r
 \r
 clean:\r

diff --git a/BuildTests/ModuleTest/makefile b/BuildTests/ModuleTest/makefile
index c0d3ec0..5970073 100644 (file)
--- a/BuildTests/ModuleTest/makefile
+++ b/BuildTests/ModuleTest/makefile
@@ -37,21 +37,21 @@ end:
        @echo\r
 \r
 %.avr8:\r
        @echo\r
 \r
 %.avr8:\r

-       $(MAKE) -f makefile.avr8 clean -s\r
-       $(MAKE) -f makefile.avr8 all MCU=$(@:%.avr8=%) -s\r
+       $(MAKE) -s -f makefile.avr8 clean\r
+       $(MAKE) -s -f makefile.avr8 all MCU=$(@:%.avr8=%) elf\r

 \r
 %.xmega:\r
 \r
 %.xmega:\r

-       $(MAKE) -f makefile.xmega clean -s\r
-       $(MAKE) -f makefile.xmega all MCU=$(@:%.xmega=%) -s\r
+       $(MAKE) -s -f makefile.xmega clean\r
+       $(MAKE) -s -f makefile.xmega all MCU=$(@:%.xmega=%) elf\r

 \r
 %.uc3:\r
 \r
 %.uc3:\r

-       $(MAKE) -f makefile.uc3 clean -s\r
-       $(MAKE) -f makefile.uc3 all MCU=$(@:%.uc3=%) -s\r
+       $(MAKE) -s -f makefile.uc3 clean\r
+       $(MAKE) -s -f makefile.uc3 all MCU=$(@:%.uc3=%) elf\r

 \r
 clean:\r
 \r
 clean:\r

-       $(MAKE) -f makefile.avr8 clean -s\r
-       $(MAKE) -f makefile.xmega clean -s\r
-       $(MAKE) -f makefile.uc3 clean -s\r
+       $(MAKE) -s -f makefile.avr8 clean\r
+       $(MAKE) -s -f makefile.xmega clean\r
+       $(MAKE) -s -f makefile.uc3 clean\r

 \r
 %:\r
        
\ No newline at end of file
 \r
 %:\r
        
\ No newline at end of file

diff --git a/BuildTests/SingleUSBModeTest/makefile b/BuildTests/SingleUSBModeTest/makefile
index 701a4b9..725f4a5 100644 (file)
--- a/BuildTests/SingleUSBModeTest/makefile
+++ b/BuildTests/SingleUSBModeTest/makefile
@@ -23,23 +23,23 @@ end:
        @echo\r
 \r
 compile:\r
        @echo\r
 \r
 compile:\r

-       $(MAKE) -f makefile.avr8 clean -s\r
-       $(MAKE) -f makefile.avr8 LUFA_OPTS='-D USB_DEVICE_ONLY' -s\r
-       $(MAKE) -f makefile.avr8 clean -s\r
-       $(MAKE) -f makefile.avr8 LUFA_OPTS='-D USB_HOST_ONLY' -s\r
-\r
-       $(MAKE) -f makefile.xmega clean -s\r
-       $(MAKE) -f makefile.xmega LUFA_OPTS='-D USB_DEVICE_ONLY' -s\r
-\r
-       $(MAKE) -f makefile.uc3 clean -s\r
-       $(MAKE) -f makefile.uc3 LUFA_OPTS='-D USB_DEVICE_ONLY' -s\r
-       $(MAKE) -f makefile.uc3 clean -s\r
-       $(MAKE) -f makefile.uc3 LUFA_OPTS='-D USB_HOST_ONLY' -s\r
+       $(MAKE) -s -f makefile.avr8 clean\r
+       $(MAKE) -s -f makefile.avr8 LUFA_OPTS='-D USB_DEVICE_ONLY' elf\r
+       $(MAKE) -s -f makefile.avr8 clean\r
+       $(MAKE) -s -f makefile.avr8 LUFA_OPTS='-D USB_HOST_ONLY' elf\r
+\r
+       $(MAKE) -s -f makefile.xmega clean\r
+       $(MAKE) -s -f makefile.xmega LUFA_OPTS='-D USB_DEVICE_ONLY' elf\r
+       \r
+       $(MAKE) -s -f makefile.uc3 clean\r
+       $(MAKE) -s -f makefile.uc3 LUFA_OPTS='-D USB_DEVICE_ONLY' elf\r
+       $(MAKE) -s -f makefile.uc3 clean\r
+       $(MAKE) -s -f makefile.uc3 LUFA_OPTS='-D USB_HOST_ONLY' elf\r

 \r
 clean:\r
 \r
 clean:\r

-       $(MAKE) -f makefile.avr8 clean -s\r
-       $(MAKE) -f makefile.xmega clean -s\r
-       $(MAKE) -f makefile.uc3 clean -s\r
+       $(MAKE) -s -f makefile.avr8 clean\r
+       $(MAKE) -s -f makefile.xmega clean\r
+       $(MAKE) -s -f makefile.uc3 clean\r

 \r
 %:\r
        
\ No newline at end of file
 \r
 %:\r
        
\ No newline at end of file

diff --git a/BuildTests/makefile b/BuildTests/makefile
index dfa4f8d..ac0cde2 100644 (file)
--- a/BuildTests/makefile
+++ b/BuildTests/makefile
@@ -11,13 +11,8 @@
 # not intended to be modified or compiled by non-developers.\r
 \r
 all:\r
 # not intended to be modified or compiled by non-developers.\r
 \r
 all:\r

-       $(MAKE) -C ModuleTest all\r
-       $(MAKE) -C SingleUSBModeTest all\r
-       $(MAKE) -C StaticAnalysisTest all\r
-       $(MAKE) -C BoardDriverTest all\r
-\r

 %:\r
 %:\r

+       $(MAKE) -C BoardDriverTest $@\r

        $(MAKE) -C ModuleTest $@\r
        $(MAKE) -C SingleUSBModeTest $@\r
        $(MAKE) -C StaticAnalysisTest $@\r
        $(MAKE) -C ModuleTest $@\r
        $(MAKE) -C SingleUSBModeTest $@\r
        $(MAKE) -C StaticAnalysisTest $@\r

-       $(MAKE) -C BoardDriverTest $@\r