From afc0ad4d57b5283106af77d157d4af1de4b025f1 Mon Sep 17 00:00:00 2001 From: Leandro Lanzieri Date: Tue, 10 Mar 2020 16:03:36 +0100 Subject: [PATCH] cpu/esp_common: Set RIOT_TEST_TIMEOUT with conditional expansion --- cpu/esp_common/Makefile.include | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/cpu/esp_common/Makefile.include b/cpu/esp_common/Makefile.include index 2fab95ef5f..7774b40e7b 100644 --- a/cpu/esp_common/Makefile.include +++ b/cpu/esp_common/Makefile.include @@ -132,11 +132,7 @@ else FFLAGS += 0x10000 $(FLASHFILE).bin endif +# NOTE: These checks can be turned into normal conditionals when #9913 is fixed # increase the test timeout for file system tests that use the SPI flash drive -ifneq (,$(filter spiffs,$(USEMODULE))) - export RIOT_TEST_TIMEOUT = 120 -endif - -ifneq (,$(filter littlefs,$(USEMODULE))) - export RIOT_TEST_TIMEOUT = 120 -endif +RIOT_TEST_TIMEOUT = $(if $(filter spiffs littlefs,$(USEMODULE)),120) +$(call target-export-variables,test,RIOT_TEST_TIMEOUT)