Merge pull request #7065 from mikeller/add_equals_to_test_makefile

Added '=' after defines in test Makefile to avoid conflicts because gcc defaults to '1' for command line defines.
This commit is contained in:
Michael Keller 2018-11-13 08:31:35 +13:00 committed by GitHub
commit e287a949de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 20 deletions

View File

@ -55,15 +55,15 @@ baro_bmp280_unittest_SRC := \
$(USER_DIR)/drivers/barometer/barometer_bmp280.c
baro_bmp280_unittest_DEFINES := \
USE_BARO_BMP280 \
USE_BARO_SPI_BMP280
USE_BARO_BMP280= \
USE_BARO_SPI_BMP280=
baro_ms5611_unittest_SRC := \
$(USER_DIR)/drivers/barometer/barometer_ms5611.c
baro_ms5611_unittest_DEFINES := \
USE_BARO_MS5611 \
USE_BARO_SPI_MS5611
USE_BARO_MS5611= \
USE_BARO_SPI_MS5611=
# This test is disabled due to build errors.
# Its source code is archived in unit/battery_unittest.cc.txt
@ -96,8 +96,8 @@ cli_unittest_SRC := \
$(USER_DIR)/common/typeconversion.c
cli_unittest_DEFINES := \
USE_OSD \
USE_CLI \
USE_OSD= \
USE_CLI= \
SystemCoreClock=1000000
cms_unittest_SRC := \
@ -166,10 +166,10 @@ osd_unittest_SRC := \
$(USER_DIR)/fc/runtime_config.c
osd_unittest_DEFINES := \
USE_OSD \
USE_OSD= \
USE_GPS= \
USE_RTC_TIME \
USE_ADC_INTERNAL
USE_RTC_TIME= \
USE_ADC_INTERNAL=
pg_unittest_SRC := \
@ -245,7 +245,7 @@ telemetry_crsf_unittest_SRC := \
telemetry_crsf_unittest_DEFINES := \
FLASH_SIZE=128 \
STM32F10X_MD \
STM32F10X_MD= \
__TARGET__="TEST" \
__REVISION__="revision"
@ -265,7 +265,7 @@ telemetry_crsf_msp_unittest_SRC := \
$(USER_DIR)/fc/runtime_config.c
telemetry_crsf_msp_unittest_DEFINES := \
USE_MSP_OVER_TELEMETRY
USE_MSP_OVER_TELEMETRY=
telemetry_hott_unittest_SRC := \
@ -306,7 +306,7 @@ huffman_unittest_SRC := \
$(USER_DIR)/common/huffman_table.c
huffman_unittest_DEFINES := \
USE_HUFFMAN
USE_HUFFMAN=
rcdevice_unittest_SRC := \
$(USER_DIR)/common/crc.c \
@ -324,13 +324,13 @@ pid_unittest_SRC := \
$(USER_DIR)/fc/runtime_config.c
pid_unittest_DEFINES := \
USE_ITERM_RELAX \
USE_RC_SMOOTHING_FILTER \
USE_ABSOLUTE_CONTROL\
USE_LAUNCH_CONTROL
USE_ITERM_RELAX= \
USE_RC_SMOOTHING_FILTER= \
USE_ABSOLUTE_CONTROL= \
USE_LAUNCH_CONTROL=
rcdevice_unittest_DEFINES := \
USE_RCDEVICE
USE_RCDEVICE=
vtx_unittest_SRC := \
$(USER_DIR)/fc/core.c \
@ -345,9 +345,9 @@ vtx_unittest_SRC := \
$(USER_DIR)/common/bitarray.c
vtx_unittest_DEFINES := \
USE_VTX_COMMON \
USE_VTX_CONTROL \
USE_VTX_SMARTAUDIO
USE_VTX_COMMON= \
USE_VTX_CONTROL= \
USE_VTX_SMARTAUDIO=
# Please tweak the following variable definitions as needed by your
# project, except GTEST_HEADERS, which you can use in your own targets