From e606c17627749dbe936eb39c46acb5db885e2956 Mon Sep 17 00:00:00 2001 From: Deepika Date: Tue, 14 Nov 2017 09:48:29 -0600 Subject: [PATCH] FSFAT_SDCARD_INSTALLED - Null test were tested FSFAT_SDCARD_INSTALLED if present in SD library no test was actually tested. Using MBED_CONF_APP_FSFAT_SDCARD_INSTALLED or MBED_CONF_SD_FSFAT_SDCARD_INSTALLED, to allow this define to be used from app and lib json files. --- TESTS/filesystem/basic/basic.cpp | 4 ++-- TESTS/filesystem/fopen/fopen.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/TESTS/filesystem/basic/basic.cpp b/TESTS/filesystem/basic/basic.cpp index d5860b7685..e0f6badad4 100644 --- a/TESTS/filesystem/basic/basic.cpp +++ b/TESTS/filesystem/basic/basic.cpp @@ -90,7 +90,7 @@ using namespace utest::v1; * }, * <<< lines removed >>> */ -#if defined(DEVICE_SPI) && defined(MBED_CONF_APP_FSFAT_SDCARD_INSTALLED) +#if defined(DEVICE_SPI) && ( defined(MBED_CONF_APP_FSFAT_SDCARD_INSTALLED) || (MBED_CONF_SD_FSFAT_SDCARD_INSTALLED)) #define FSFAT_BASIC_TEST_00 fsfat_basic_test_00 #define FSFAT_BASIC_TEST_01 fsfat_basic_test_01 @@ -897,7 +897,7 @@ static control_t fsfat_basic_test_dummy() return CaseNext; } -#endif /* defined(DEVICE_SPI) && defined(MBED_CONF_APP_FSFAT_SDCARD_INSTALLED) */ +#endif utest::v1::status_t greentea_setup(const size_t number_of_cases) { diff --git a/TESTS/filesystem/fopen/fopen.cpp b/TESTS/filesystem/fopen/fopen.cpp index d4f5ad2ffa..fb533b107d 100644 --- a/TESTS/filesystem/fopen/fopen.cpp +++ b/TESTS/filesystem/fopen/fopen.cpp @@ -75,8 +75,8 @@ using namespace utest::v1; * }, * <<< lines removed >>> */ -#if defined(DEVICE_SPI) && defined(MBED_CONF_APP_FSFAT_SDCARD_INSTALLED) - + +#if defined(DEVICE_SPI) && ( defined(MBED_CONF_APP_FSFAT_SDCARD_INSTALLED) || (MBED_CONF_SD_FSFAT_SDCARD_INSTALLED)) static char fsfat_fopen_utest_msg_g[FSFAT_UTEST_MSG_BUF_SIZE]; #define FSFAT_FOPEN_TEST_MOUNT_PT_NAME "sd" #define FSFAT_FOPEN_TEST_MOUNT_PT_PATH "/"FSFAT_FOPEN_TEST_MOUNT_PT_NAME @@ -1490,7 +1490,7 @@ static control_t fsfat_fopen_test_dummy() return CaseNext; } -#endif /* defined(DEVICE_SPI) && defined(MBED_CONF_APP_FSFAT_SDCARD_INSTALLED) */ +#endif /// @cond FSFAT_DOXYGEN_DISABLE