Merge pull request #6326 from smlng/pr/osx/tests_name_clash

tests: fix linker failure on OS X due to name clash
6 years ago · 76f951b54f
18 changed files with 18 additions and 16 deletions
--- a/tests/Makefile.tests_common
+++ b/tests/Makefile.tests_common
@ -1,3 +1,4 @@
 BOARD ?= native
 RIOTBASE ?= $(CURDIR)/../..
 QUIET ?= 1
+APPLICATION := tests_$(APPLICATION)
--- a/tests/driver_enc28j60/Makefile
+++ b/tests/driver_enc28j60/Makefile
@ -1,4 +1,4 @@
-export APPLICATION = driver_enc28j60
+APPLICATION = driver_enc28j60
 include ../Makefile.tests_common

 FEATURES_REQUIRED = periph_spi periph_gpio
--- a/tests/driver_encx24j600/Makefile
+++ b/tests/driver_encx24j600/Makefile
@ -1,4 +1,4 @@
-export APPLICATION = driver_encx24j600
+APPLICATION = driver_encx24j600
 include ../Makefile.tests_common

 FEATURES_REQUIRED = periph_spi periph_gpio
--- a/tests/driver_servo/Makefile
+++ b/tests/driver_servo/Makefile
@ -1,4 +1,4 @@
-export APPLICATION = driver_servo
+APPLICATION = driver_servo
 include ../Makefile.tests_common

 FEATURES_REQUIRED = periph_pwm
--- a/tests/leds/Makefile
+++ b/tests/leds/Makefile
@ -1,4 +1,4 @@
-export APPLICATION = leds
+APPLICATION = leds
 include ../Makefile.tests_common

 include $(RIOTBASE)/Makefile.include
--- a/tests/malloc/Makefile
+++ b/tests/malloc/Makefile
@ -1,5 +1,5 @@
 # name of your application
-APPLICATION = test_malloc
+APPLICATION = malloc

 # If no BOARD is found in the environment, use this default:
 BOARD ?= native
--- a/tests/periph_cpuid/Makefile
+++ b/tests/periph_cpuid/Makefile
@ -1,4 +1,4 @@
-export APPLICATION = periph_cpuid
+APPLICATION = periph_cpuid
 include ../Makefile.tests_common

 FEATURES_REQUIRED = periph_cpuid
--- a/tests/periph_flashpage/Makefile
+++ b/tests/periph_flashpage/Makefile
@ -1,4 +1,4 @@
-export APPLICATION = periph_flashpage
+APPLICATION = periph_flashpage
 include ../Makefile.tests_common

 FEATURES_REQUIRED = periph_flashpage
--- a/tests/periph_gpio/Makefile
+++ b/tests/periph_gpio/Makefile
@ -1,4 +1,4 @@
-export APPLICATION = periph_gpio
+APPLICATION = periph_gpio
 include ../Makefile.tests_common

 FEATURES_REQUIRED = periph_gpio
--- a/tests/periph_hwrng/Makefile
+++ b/tests/periph_hwrng/Makefile
@ -1,4 +1,4 @@
-export APPLICATION = periph_hwrng
+APPLICATION = periph_hwrng
 include ../Makefile.tests_common

 FEATURES_REQUIRED = periph_hwrng
--- a/tests/pkg_cmsis-dsp/Makefile
+++ b/tests/pkg_cmsis-dsp/Makefile
@ -1,4 +1,4 @@
-APPLICATION = test-cmsis-dsp
+APPLICATION = cmsis-dsp
 include ../Makefile.tests_common

 USEPKG += cmsis-dsp
--- a/tests/pkg_libcoap/Makefile
+++ b/tests/pkg_libcoap/Makefile
@ -1,4 +1,4 @@
-APPLICATION = coap
+APPLICATION = pkg_libcoap
 include ../Makefile.tests_common

 # msp430 and avr have problems with int width and libcoaps usage of :x notation in structs
--- a/tests/pkg_libcoap/main.c
+++ b/tests/pkg_libcoap/main.c
--- a/tests/pkg_oonf_api/Makefile
+++ b/tests/pkg_oonf_api/Makefile
@ -1,4 +1,4 @@
-APPLICATION = test_pkg_oonf_api
+APPLICATION = pkg_oonf_api
 include ../Makefile.tests_common

 BOARD_WHITELIST := native
--- a/tests/pkg_tiny-asn1/Makefile
+++ b/tests/pkg_tiny-asn1/Makefile
@ -1,5 +1,6 @@
-APPLICATION = tiny-asn1
+APPLICATION = pkg_tiny-asn1
 include ../Makefile.tests_common
+
 USEPKG += tiny-asn1

 include $(RIOTBASE)/Makefile.include
--- a/tests/unittests/tests-tweetnacl/Makefile
+++ b/tests/unittests/tests-tweetnacl/Makefile
@ -1 +1 @@
-include $(RIOTBASE)/Makefile.base
+include $(RIOTBASE)/Makefile.base
--- a/tests/xtimer_now64_continuity/Makefile
+++ b/tests/xtimer_now64_continuity/Makefile
@ -1,4 +1,4 @@
-export APPLICATION = xtimer_now64_continuity
+APPLICATION = xtimer_now64_continuity
 include ../Makefile.tests_common

 USEMODULE += xtimer
--- a/tests/xtimer_usleep/Makefile
+++ b/tests/xtimer_usleep/Makefile
@ -6,4 +6,4 @@ USEMODULE += xtimer
 include $(RIOTBASE)/Makefile.include

 test:
-	./tests/01-run.py
+	./tests/01-run.py