From a542e020859bb76dd7a4f0df49d09d8679acafe4 Mon Sep 17 00:00:00 2001 From: MarceloSalazar Date: Thu, 17 Oct 2019 16:45:15 +0100 Subject: [PATCH] Split integration tests in fs/net --- ...efines_test.h => common_defines_fs_test.h} | 26 ++---------- .../COMMON/common_defines_net_test.h | 40 +++++++++++++++++++ TESTS/integration/fs-single/main.cpp | 2 +- TESTS/integration/fs-threaded/main.cpp | 2 +- TESTS/integration/net-single/main.cpp | 2 +- TESTS/integration/net-threaded/main.cpp | 2 +- TESTS/integration/stress-net-fs/main.cpp | 3 +- 7 files changed, 49 insertions(+), 28 deletions(-) rename TESTS/integration/COMMON/{common_defines_test.h => common_defines_fs_test.h} (70%) create mode 100644 TESTS/integration/COMMON/common_defines_net_test.h diff --git a/TESTS/integration/COMMON/common_defines_test.h b/TESTS/integration/COMMON/common_defines_fs_test.h similarity index 70% rename from TESTS/integration/COMMON/common_defines_test.h rename to TESTS/integration/COMMON/common_defines_fs_test.h index 8b1c07739d..e0db35150e 100644 --- a/TESTS/integration/COMMON/common_defines_test.h +++ b/TESTS/integration/COMMON/common_defines_fs_test.h @@ -20,27 +20,6 @@ #define TRACE_GROUP "GRNT" -#define ETHERNET 1 -#define WIFI 2 -#define MESH 3 -#define CELLULAR 4 - -#if !defined(MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE) -#error [NOT_SUPPORTED] No network interface found on this target. -#endif - -#if MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE == ETHERNET -#define TEST_NETWORK_TYPE "Ethernet" -#elif MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE == WIFI -#define TEST_NETWORK_TYPE "WiFi" -#elif MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE == MESH -#define TEST_NETWORK_TYPE "Mesh" -#elif MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE == CELLULAR -#define TEST_NETWORK_TYPE "Cellular" -#else -#error [NOT_SUPPORTED] Either WiFi, Ethernet or Cellular network interface need to be enabled -#endif - #define FS_FAT 1 #define FS_LFS 2 @@ -53,15 +32,16 @@ #elif COMPONENT_SD #define TEST_BLOCK_DEVICE_TYPE "SD" #define TEST_USE_FILESYSTEM FS_FAT -#elif COMPONENT_FLASHIAP -#define TEST_BLOCK_DEVICE_TYPE "FLASHIAP" #elif COMPONENT_SDIO #define TEST_BLOCK_DEVICE_TYPE "SDIO" #elif COMPONENT_NUSD #define TEST_BLOCK_DEVICE_TYPE "NUSD" #define TEST_USE_FILESYSTEM FS_FAT +#elif COMPONENT_FLASHIAP && MBED_CONF_FLASHIAP_BLOCK_DEVICE_SIZE +#define TEST_BLOCK_DEVICE_TYPE "FLASHIAP" #else #define TEST_BLOCK_DEVICE_TYPE "UNKNOWN" +#error [NOT_SUPPORTED] no valid block device enabled for this target #endif #if !defined(TEST_USE_FILESYSTEM) diff --git a/TESTS/integration/COMMON/common_defines_net_test.h b/TESTS/integration/COMMON/common_defines_net_test.h new file mode 100644 index 0000000000..05545df48e --- /dev/null +++ b/TESTS/integration/COMMON/common_defines_net_test.h @@ -0,0 +1,40 @@ +/* + * mbed Microcontroller Library + * Copyright (c) 2006-2019 ARM Limited + * + * SPDX-License-Identifier: Apache-2.0 + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#define ETHERNET 1 +#define WIFI 2 +#define MESH 3 +#define CELLULAR 4 + +#if !defined(MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE) +#error [NOT_SUPPORTED] No network interface found on this target. +#endif + +#if MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE == ETHERNET +#define TEST_NETWORK_TYPE "Ethernet" +#elif MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE == WIFI +#define TEST_NETWORK_TYPE "WiFi" +#elif MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE == MESH +#define TEST_NETWORK_TYPE "Mesh" +#elif MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE == CELLULAR +#define TEST_NETWORK_TYPE "Cellular" +#else +#define TEST_NETWORK_TYPE "Unknown" +#error [NOT_SUPPORTED] Either WiFi, Ethernet or Cellular network interface need to be enabled +#endif diff --git a/TESTS/integration/fs-single/main.cpp b/TESTS/integration/fs-single/main.cpp index 5fb2ca1840..d6275ad6bf 100644 --- a/TESTS/integration/fs-single/main.cpp +++ b/TESTS/integration/fs-single/main.cpp @@ -31,7 +31,7 @@ #include "utest/utest.h" #include "unity/unity.h" #include "greentea-client/test_env.h" -#include "common_defines_test.h" +#include "common_defines_fs_test.h" #include "file_test.h" #ifdef MBED_CONF_APP_BASICS_TEST_FILENAME diff --git a/TESTS/integration/fs-threaded/main.cpp b/TESTS/integration/fs-threaded/main.cpp index f1af5dbc06..69a8389192 100644 --- a/TESTS/integration/fs-threaded/main.cpp +++ b/TESTS/integration/fs-threaded/main.cpp @@ -31,7 +31,7 @@ #include "utest/utest.h" #include "unity/unity.h" #include "greentea-client/test_env.h" -#include "common_defines_test.h" +#include "common_defines_fs_test.h" #include "file_test.h" #ifdef MBED_CONF_APP_BASICS_TEST_FILENAME diff --git a/TESTS/integration/net-single/main.cpp b/TESTS/integration/net-single/main.cpp index 5d21912dad..f97ca11ba0 100644 --- a/TESTS/integration/net-single/main.cpp +++ b/TESTS/integration/net-single/main.cpp @@ -29,7 +29,7 @@ #include "utest/utest.h" #include "unity/unity.h" #include "greentea-client/test_env.h" -#include "common_defines_test.h" +#include "common_defines_net_test.h" #include "download_test.h" #include diff --git a/TESTS/integration/net-threaded/main.cpp b/TESTS/integration/net-threaded/main.cpp index 4b2b22da32..64f0818853 100644 --- a/TESTS/integration/net-threaded/main.cpp +++ b/TESTS/integration/net-threaded/main.cpp @@ -29,7 +29,7 @@ #include "utest/utest.h" #include "unity/unity.h" #include "greentea-client/test_env.h" -#include "common_defines_test.h" +#include "common_defines_net_test.h" #include "download_test.h" #include diff --git a/TESTS/integration/stress-net-fs/main.cpp b/TESTS/integration/stress-net-fs/main.cpp index 350e323df9..e6ce41a5f0 100644 --- a/TESTS/integration/stress-net-fs/main.cpp +++ b/TESTS/integration/stress-net-fs/main.cpp @@ -31,7 +31,8 @@ #include "utest/utest.h" #include "unity/unity.h" #include "greentea-client/test_env.h" -#include "common_defines_test.h" +#include "common_defines_fs_test.h" +#include "common_defines_net_test.h" #include "download_test.h" #include "file_test.h" #include