Skip to content

Commit

Permalink
fixes to satisfy Travis
Browse files Browse the repository at this point in the history
  • Loading branch information
thomaseichinger committed Sep 24, 2014
1 parent 4dc4c1c commit 102658d
Show file tree
Hide file tree
Showing 14 changed files with 23 additions and 14 deletions.
1 change: 1 addition & 0 deletions dist/tools/licenses/patterns/3c-BSD-atmel2
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following condition is met: 1\. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer\. 2\. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution\. 3\. The name of Atmel may not be used to endorse or promote products derived from this software without specific prior written permission\. 4\. This software may only be redistributed and used in connection with an Atmel microcontroller product\. THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE EXPRESSLY AND SPECIFICALLY DISCLAIMED\. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE\.
3 changes: 2 additions & 1 deletion examples/ccn-lite-client/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ QUIET ?= 1
BOARD_INSUFFICIENT_RAM := chronos msb-430h telosb wsn430-v1_3b wsn430-v1_4 z1 redbee-econotag
BOARD_BLACKLIST := arduino-due mbed_lpc1768 msb-430 pttu udoo qemu-i386 \
stm32f0discovery stm32f3discovery stm32f4discovery pca10000 pca10005 \
arduino-mega2560 msbiot yunjia-nrf51822
arduino-mega2560 msbiot yunjia-nrf51822 samr21-xpro
# mbed_lpc1768: see https://github.com/RIOT-OS/RIOT/issues/675
# msb-430: see https://github.com/RIOT-OS/RIOT/issues/658
# pttu: see https://github.com/RIOT-OS/RIOT/issues/659
Expand All @@ -43,6 +43,7 @@ BOARD_BLACKLIST := arduino-due mbed_lpc1768 msb-430 pttu udoo qemu-i386 \
# arduino-mega2560: no transceiver, yet
# msbiot: no transceiver, yet
# yunjia-nrf51822: no transceiver, yet
# samr21-xpro: no transceiver, yet

# Modules to include:

Expand Down
4 changes: 3 additions & 1 deletion examples/ccn-lite-relay/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ QUIET ?= 1
BOARD_INSUFFICIENT_RAM := chronos msb-430h telosb wsn430-v1_3b wsn430-v1_4 z1 redbee-econotag
BOARD_BLACKLIST := arduino-due mbed_lpc1768 msb-430 pttu udoo qemu-i386 \
stm32f0discovery stm32f3discovery stm32f4discovery \
pca10000 pca10005 arduino-mega2560 msbiot yunjia-nrf51822
pca10000 pca10005 arduino-mega2560 msbiot yunjia-nrf51822 \
samr21-xpro
# mbed_lpc1768: see https://github.com/RIOT-OS/RIOT/issues/675
# msb-430: see https://github.com/RIOT-OS/RIOT/issues/658
# pttu: see https://github.com/RIOT-OS/RIOT/issues/659
Expand All @@ -42,6 +43,7 @@ BOARD_BLACKLIST := arduino-due mbed_lpc1768 msb-430 pttu udoo qemu-i386 \
# arduino-mega2560: no transceiver, yet
# msbiot: no transceiver, yet
# yunjia-nrf51822: no transceiver, yet
# samr21-xpro: no transceiver, yet

# Modules to include:

Expand Down
3 changes: 2 additions & 1 deletion examples/riot_and_cpp/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ QUIET ?= 1
BOARD_BLACKLIST := arduino-due avsextrem chronos mbed_lpc1768 msb-430h msba2 redbee-econotag \
telosb wsn430-v1_3b wsn430-v1_4 msb-430 pttu udoo qemu-i386 z1 stm32f0discovery \
stm32f3discovery stm32f4discovery pca10000 pca10005 iot-lab_M3 arduino-mega2560 \
msbiot yunjia-nrf51822
msbiot yunjia-nrf51822 samr21-xpro

# This example only works with native for now.
# msb430-based boards: msp430-g++ is not provided in mspgcc.
Expand All @@ -46,6 +46,7 @@ BOARD_BLACKLIST := arduino-due avsextrem chronos mbed_lpc1768 msb-430h msba2 red
# iot-lab_M3: g++ does not support some used flags (e.g. -mthumb...)
# arduino-mega2560: cstdio header missing from avr-libc
# msbiot g++ does not support some used flags (e.g. -mthumb...)
# samr21-xpro g++ does not support some used flags (e.g. -mthumb...)
# others: untested.

# If you want to add some extra flags when compile c++ files, add these flags
Expand Down
3 changes: 2 additions & 1 deletion examples/rpl_udp/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ endif
BOARD_INSUFFICIENT_RAM := chronos msb-430h redbee-econotag telosb wsn430-v1_3b wsn430-v1_4 z1
BOARD_BLACKLIST := arduino-due mbed_lpc1768 msb-430 pttu udoo qemu-i386 stm32f0discovery \
stm32f3discovery stm32f4discovery pca10000 pca10005 arduino-mega2560 \
msbiot yunjia-nrf51822
msbiot yunjia-nrf51822 samr21-xpro
# mbed_lpc1768: see https://github.com/RIOT-OS/RIOT/issues/675
# msb-430: see https://github.com/RIOT-OS/RIOT/issues/658
# pttu: see https://github.com/RIOT-OS/RIOT/issues/659
Expand All @@ -50,6 +50,7 @@ BOARD_BLACKLIST := arduino-due mbed_lpc1768 msb-430 pttu udoo qemu-i386 stm32f0d
# arduino-mega2560: time.h missing from avr-libc
# msbiot: no transceiver, yet
# yunjia-nrf51822: no transceiver, yet
# samr21-xpro: no transceiver, yet

# Modules to include:

Expand Down
3 changes: 2 additions & 1 deletion tests/bloom/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ include ../Makefile.tests_common

BOARD_INSUFFICIENT_RAM := chronos mbed_lpc1768 msb-430 msb-430h redbee-econotag \
telosb wsn430-v1_3b wsn430-v1_4 z1 stm32f0discovery \
stm32f3discovery pca10000 pca10005 yunjia-nrf51822
stm32f3discovery pca10000 pca10005 yunjia-nrf51822 \
samr21-xpro

BOARD_BLACKLIST := arduino-mega2560
# arduino-mega2560: Errors in assembly, e.g:
Expand Down
2 changes: 1 addition & 1 deletion tests/coap/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ include ../Makefile.tests_common

BOARD_BLACKLIST := arduino-due chronos mbed_lpc1768 msb-430 msb-430h qemu-i386 stm32f0discovery \
stm32f3discovery stm32f4discovery telosb wsn430-v1_3b wsn430-v1_4 udoo z1 \
pca10000 pca10005 arduino-mega2560 msbiot yunjia-nrf51822
pca10000 pca10005 arduino-mega2560 msbiot yunjia-nrf51822 samr21-xpro
#arduino-mega2560: missing header sys/types.h
#MSP boards: no assert.h
#rest: no radio
Expand Down
4 changes: 3 additions & 1 deletion tests/net_if/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
APPLICATION = net_if

BOARD_BLACKLIST = mbed_lpc1768 arduino-due udoo qemu-i386 stm32f0discovery stm32f3discovery \
stm32f4discovery pca10000 pca10005 arduino-mega2560 msbiot yunjia-nrf51822
stm32f4discovery pca10000 pca10005 arduino-mega2560 msbiot yunjia-nrf51822 \
samr21-xpro
# qemu-i386: no transceiver, yet
# stm32f0discovery: no transceiver, yet
# stm32f3discovery: no transceiver, yet
Expand All @@ -10,6 +11,7 @@ BOARD_BLACKLIST = mbed_lpc1768 arduino-due udoo qemu-i386 stm32f0discovery stm32
# pca10005: no transceiver, yet
# msbiot: no transceiver, yet
# yunjia-nrf51822: no transceiver, yet
# samr21-xpro: no transceiver, yet

include ../Makefile.tests_common

Expand Down
3 changes: 2 additions & 1 deletion tests/pnet/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ include ../Makefile.tests_common
BOARD_INSUFFICIENT_RAM := chronos msb-430h redbee-econotag telosb wsn430-v1_3b wsn430-v1_4 z1
BOARD_BLACKLIST := arduino-due mbed_lpc1768 msb-430 udoo qemu-i386 stm32f0discovery \
stm32f3discovery stm32f4discovery pca10000 pca10005 arduino-mega2560 \
msbiot yunjia-nrf51822
msbiot yunjia-nrf51822 samr21-xpro
# mbed_lpc1768: see https://github.com/RIOT-OS/RIOT/issues/675
# msb-430: see https://github.com/RIOT-OS/RIOT/issues/658
# qemu-i386: no transceiver, yet
Expand All @@ -16,6 +16,7 @@ BOARD_BLACKLIST := arduino-due mbed_lpc1768 msb-430 udoo qemu-i386 stm32f0discov
# arduino-mega2560: unknown type name ‘radio_packet_length_t’
# msbiot: no transceiver, yet
# yunjia-nrf51822: no transceiver, yet
# yunjia-nrf51822: no transceiver, yet

USEMODULE += posix
USEMODULE += pnet
Expand Down
2 changes: 1 addition & 1 deletion tests/posix_semaphore/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ APPLICATION = posix_semaphore
include ../Makefile.tests_common

BOARD_INSUFFICIENT_RAM := msb-430 msb-430h mbed_lpc1768 redbee-econotag chronos stm32f0discovery \
pca10000 pca10005 yunjia-nrf51822
pca10000 pca10005 yunjia-nrf51822 samr21-xpro

USEMODULE += posix

Expand Down
2 changes: 1 addition & 1 deletion tests/pthread_rwlock/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ DISABLE_MODULE += auto_init
CFLAGS += -DNATIVE_AUTO_EXIT

BOARD_INSUFFICIENT_RAM += chronos mbed_lpc1768 msb-430 msb-430h stm32f0discovery \
pca10000 pca10005 yunjia-nrf51822
pca10000 pca10005 yunjia-nrf51822 samr21-xpro

include $(RIOTBASE)/Makefile.include
2 changes: 1 addition & 1 deletion tests/queue_fairness/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
APPLICATION = queue_fairness
include ../Makefile.tests_common

BOARD_INSUFFICIENT_RAM := mbed_lpc1768 stm32f0discovery pca10000 pca10005
BOARD_INSUFFICIENT_RAM := mbed_lpc1768 stm32f0discovery pca10000 pca10005 samr21-xpro

USEMODULE += vtimer

Expand Down
3 changes: 1 addition & 2 deletions tests/thread_cooperation/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@ APPLICATION = thread_cooperation
include ../Makefile.tests_common

BOARD_INSUFFICIENT_RAM := chronos msb-430 msb-430h mbed_lpc1768 redbee-econotag stm32f0discovery \
pca10000 pca10005 yunjia-nrf51822
pca10000 pca10005 yunjia-nrf51822 samr21-xpro

DISABLE_MODULE += auto_init

include $(RIOTBASE)/Makefile.include

2 changes: 1 addition & 1 deletion tests/vtimer_msg_diff/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ BOARD_BLACKLIST := arduino-mega2560
# arduino-mega2560: missing define for PRId64, avr-libc's printf function
# possibly not compatible at all

BOARD_INSUFFICIENT_RAM := mbed_lpc1768 stm32f0discovery pca10000 pca10005
BOARD_INSUFFICIENT_RAM := mbed_lpc1768 stm32f0discovery pca10000 pca10005 samr21-xpro

USEMODULE += vtimer

Expand Down

0 comments on commit 102658d

Please sign in to comment.