Merge pull request #11943 from 0xc0170/integration-tests-split

Split integration tests in fs/net

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)

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

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

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

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 <string>
 

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 <string>
 

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 <string>