@@ -1,10 +1,10 @@
*.log
*.trs
+odp_ver_abt_log_dbg
odp_buffer
odp_classification
odp_cpumask
odp_crypto
-odp_errno
odp_init
odp_init_abort
odp_init_log
@@ -16,6 +16,5 @@ odp_random
odp_scheduler
odp_shared_memory
odp_synchronizers
-odp_system
odp_time
odp_timer
@@ -18,11 +18,10 @@ EXECUTABLES = odp_buffer \
odp_random \
odp_scheduler \
odp_shared_memory \
- odp_system \
odp_synchronizers \
odp_time \
odp_timer \
- odp_errno
+ odp_ver_abt_log_dbg
COMPILE_ONLY = odp_packet_io
@@ -63,3 +62,7 @@ dist_odp_packet_SOURCES = odp_packet.c $(ODP_CU_COMMON)
dist_odp_pool_SOURCES = odp_pool.c $(ODP_CU_COMMON)
dist_odp_errno_SOURCES = odp_errno.c $(ODP_CU_COMMON)
dist_odp_cpumask_SOURCES = odp_cpumask.c $(ODP_CU_COMMON)
+odp_ver_abt_log_dbg_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/ver_abt_log_dbg
+dist_odp_ver_abt_log_dbg_SOURCES = ver_abt_log_dbg/odp_system.c \
+ ver_abt_log_dbg/odp_errno.c \
+ ver_abt_log_dbg/odp_ver_abt_log_dbg.c $(ODP_CU_COMMON)
similarity index 81%
rename from test/validation/odp_errno.c
rename to test/validation/ver_abt_log_dbg/odp_errno.c
@@ -21,8 +21,3 @@ CU_TestInfo test_odp_errno[] = {
{"sunny day", test_odp_errno_sunny_day},
CU_TEST_INFO_NULL,
};
-
-CU_SuiteInfo odp_testsuites[] = {
- {"Errno", NULL, NULL, NULL, NULL, test_odp_errno},
- CU_SUITE_INFO_NULL,
-};
new file mode 100644
@@ -0,0 +1,9 @@
+/* Copyright (c) 2015, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include "odp_cunit_common.h"
+
+extern CU_TestInfo test_odp_errno[];
similarity index 93%
rename from test/validation/odp_system.c
rename to test/validation/ver_abt_log_dbg/odp_system.c
@@ -92,10 +92,3 @@ CU_TestInfo test_odp_system[] = {
{"odp_sys_cpu_hz", test_odp_sys_cpu_hz},
CU_TEST_INFO_NULL,
};
-
-CU_SuiteInfo odp_testsuites[] = {
- {"System Info", NULL, NULL, NULL, NULL,
- test_odp_system},
- CU_SUITE_INFO_NULL,
-};
-
new file mode 100644
@@ -0,0 +1,9 @@
+/* Copyright (c) 2015, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include "odp_cunit_common.h"
+
+extern CU_TestInfo test_odp_system[];
new file mode 100644
@@ -0,0 +1,16 @@
+/* Copyright (c) 2015, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include <odp.h>
+#include "odp_cunit_common.h"
+#include "odp_errno.h"
+#include "odp_system.h"
+
+CU_SuiteInfo odp_testsuites[] = {
+ {"Errno", NULL, NULL, NULL, NULL, test_odp_errno},
+ {"System Info", NULL, NULL, NULL, NULL, test_odp_system},
+ CU_SUITE_INFO_NULL,
+};
Created directory for module odp_ver_abt_log_dbg, populated with file odp_errno.c and odp_system.c which, despite its confusing name is not testing the system module but the sys* function of the odp_ver_abt_log_dbg module. Signed-off-by: Christophe Milard <christophe.milard@linaro.org> --- Applies on top of "PATCHv2:rename executable to match modules" (not fully related, but affect the same Makefile) test/validation/.gitignore | 3 +-- test/validation/Makefile.am | 7 +++++-- test/validation/{ => ver_abt_log_dbg}/odp_errno.c | 5 ----- test/validation/ver_abt_log_dbg/odp_errno.h | 9 +++++++++ test/validation/{ => ver_abt_log_dbg}/odp_system.c | 7 ------- test/validation/ver_abt_log_dbg/odp_system.h | 9 +++++++++ test/validation/ver_abt_log_dbg/odp_ver_abt_log_dbg.c | 16 ++++++++++++++++ 7 files changed, 40 insertions(+), 16 deletions(-) rename test/validation/{ => ver_abt_log_dbg}/odp_errno.c (81%) create mode 100644 test/validation/ver_abt_log_dbg/odp_errno.h rename test/validation/{ => ver_abt_log_dbg}/odp_system.c (93%) create mode 100644 test/validation/ver_abt_log_dbg/odp_system.h create mode 100644 test/validation/ver_abt_log_dbg/odp_ver_abt_log_dbg.c