summaryrefslogtreecommitdiffstats
path: root/src/vppinfra
diff options
context:
space:
mode:
Diffstat (limited to 'src/vppinfra')
-rw-r--r--src/vppinfra/CMakeLists.txt26
-rw-r--r--src/vppinfra/test/array_mask.c (renamed from src/vppinfra/vector/test/array_mask.c)2
-rw-r--r--src/vppinfra/test/compress.c (renamed from src/vppinfra/vector/test/compress.c)2
-rw-r--r--src/vppinfra/test/count_equal.c (renamed from src/vppinfra/vector/test/count_equal.c)2
-rw-r--r--src/vppinfra/test/index_to_ptr.c (renamed from src/vppinfra/vector/test/index_to_ptr.c)2
-rw-r--r--src/vppinfra/test/ip_csum.c (renamed from src/vppinfra/vector/test/ip_csum.c)2
-rw-r--r--src/vppinfra/test/mask_compare.c (renamed from src/vppinfra/vector/test/mask_compare.c)2
-rw-r--r--src/vppinfra/test/memcpy_x86_64.c (renamed from src/vppinfra/vector/test/memcpy_x86_64.c)2
-rw-r--r--src/vppinfra/test/sha2.c (renamed from src/vppinfra/vector/test/sha2.c)2
-rw-r--r--src/vppinfra/test/test.c (renamed from src/vppinfra/vector/test/test.c)2
-rw-r--r--src/vppinfra/test/test.h (renamed from src/vppinfra/vector/test/test.h)0
-rw-r--r--src/vppinfra/test/toeplitz.c (renamed from src/vppinfra/vector/test/toeplitz.c)2
12 files changed, 23 insertions, 23 deletions
diff --git a/src/vppinfra/CMakeLists.txt b/src/vppinfra/CMakeLists.txt
index d7445b0982f..40951336387 100644
--- a/src/vppinfra/CMakeLists.txt
+++ b/src/vppinfra/CMakeLists.txt
@@ -273,29 +273,29 @@ if(VPP_BUILD_VPPINFRA_TESTS)
LINK_LIBRARIES vppinfra Threads::Threads
)
endforeach()
+endif(VPP_BUILD_VPPINFRA_TESTS)
set(test_files
- vector/test/array_mask.c
- vector/test/compress.c
- vector/test/count_equal.c
- vector/test/index_to_ptr.c
- vector/test/ip_csum.c
- vector/test/mask_compare.c
- vector/test/memcpy_x86_64.c
- vector/test/sha2.c
- vector/test/toeplitz.c
+ test/array_mask.c
+ test/compress.c
+ test/count_equal.c
+ test/index_to_ptr.c
+ test/ip_csum.c
+ test/mask_compare.c
+ test/memcpy_x86_64.c
+ test/sha2.c
+ test/toeplitz.c
)
-add_vpp_executable(test_vector_funcs
+add_vpp_executable(test_infra
SOURCES
- vector/test/test.c
+ test/test.c
${test_files}
LINK_LIBRARIES vppinfra
)
-vpp_library_set_multiarch_sources(test_vector_funcs
+vpp_library_set_multiarch_sources(test_infra
SOURCES
${test_files}
)
-endif(VPP_BUILD_VPPINFRA_TESTS)
diff --git a/src/vppinfra/vector/test/array_mask.c b/src/vppinfra/test/array_mask.c
index 904bb214f55..c3b475c431b 100644
--- a/src/vppinfra/vector/test/array_mask.c
+++ b/src/vppinfra/test/array_mask.c
@@ -3,7 +3,7 @@
*/
#include <vppinfra/format.h>
-#include <vppinfra/vector/test/test.h>
+#include <vppinfra/test/test.h>
#include <vppinfra/vector/array_mask.h>
__test_funct_fn void
diff --git a/src/vppinfra/vector/test/compress.c b/src/vppinfra/test/compress.c
index 4f3fd533340..7fdc3f8ee42 100644
--- a/src/vppinfra/vector/test/compress.c
+++ b/src/vppinfra/test/compress.c
@@ -3,7 +3,7 @@
*/
#include <vppinfra/format.h>
-#include <vppinfra/vector/test/test.h>
+#include <vppinfra/test/test.h>
#include <vppinfra/vector/compress.h>
__test_funct_fn u32
diff --git a/src/vppinfra/vector/test/count_equal.c b/src/vppinfra/test/count_equal.c
index c57b0275984..942c2203d3d 100644
--- a/src/vppinfra/vector/test/count_equal.c
+++ b/src/vppinfra/test/count_equal.c
@@ -3,7 +3,7 @@
*/
#include <vppinfra/format.h>
-#include <vppinfra/vector/test/test.h>
+#include <vppinfra/test/test.h>
#include <vppinfra/vector/count_equal.h>
#define foreach_clib_count_equal(type) \
diff --git a/src/vppinfra/vector/test/index_to_ptr.c b/src/vppinfra/test/index_to_ptr.c
index 7ee3b94cb7c..06b621c10ff 100644
--- a/src/vppinfra/vector/test/index_to_ptr.c
+++ b/src/vppinfra/test/index_to_ptr.c
@@ -3,7 +3,7 @@
*/
#include <vppinfra/format.h>
-#include <vppinfra/vector/test/test.h>
+#include <vppinfra/test/test.h>
#include <vppinfra/vector/index_to_ptr.h>
typedef void (wrapper_fn) (u32 *indices, void *base, u8 shift, void **ptrs,
diff --git a/src/vppinfra/vector/test/ip_csum.c b/src/vppinfra/test/ip_csum.c
index 17a606523f2..9387336ad7d 100644
--- a/src/vppinfra/vector/test/ip_csum.c
+++ b/src/vppinfra/test/ip_csum.c
@@ -3,7 +3,7 @@
*/
#include <vppinfra/format.h>
-#include <vppinfra/vector/test/test.h>
+#include <vppinfra/test/test.h>
#include <vppinfra/vector/ip_csum.h>
typedef struct
diff --git a/src/vppinfra/vector/test/mask_compare.c b/src/vppinfra/test/mask_compare.c
index 70608e11215..738b0082dd7 100644
--- a/src/vppinfra/vector/test/mask_compare.c
+++ b/src/vppinfra/test/mask_compare.c
@@ -3,7 +3,7 @@
*/
#include <vppinfra/format.h>
-#include <vppinfra/vector/test/test.h>
+#include <vppinfra/test/test.h>
#include <vppinfra/vector/mask_compare.h>
__test_funct_fn void
diff --git a/src/vppinfra/vector/test/memcpy_x86_64.c b/src/vppinfra/test/memcpy_x86_64.c
index edb32d05dc6..4d9525d5222 100644
--- a/src/vppinfra/vector/test/memcpy_x86_64.c
+++ b/src/vppinfra/test/memcpy_x86_64.c
@@ -5,7 +5,7 @@
#ifdef __x86_64__
#include <vppinfra/format.h>
-#include <vppinfra/vector/test/test.h>
+#include <vppinfra/test/test.h>
#include <vppinfra/vector/mask_compare.h>
__test_funct_fn void
diff --git a/src/vppinfra/vector/test/sha2.c b/src/vppinfra/test/sha2.c
index 81365792063..9b4abbed657 100644
--- a/src/vppinfra/vector/test/sha2.c
+++ b/src/vppinfra/test/sha2.c
@@ -3,7 +3,7 @@
*/
#include <vppinfra/format.h>
-#include <vppinfra/vector/test/test.h>
+#include <vppinfra/test/test.h>
#include <vppinfra/sha2.h>
typedef struct
diff --git a/src/vppinfra/vector/test/test.c b/src/vppinfra/test/test.c
index dc5651c47cc..15ea6fd2973 100644
--- a/src/vppinfra/vector/test/test.c
+++ b/src/vppinfra/test/test.c
@@ -3,7 +3,7 @@
*/
#include <vppinfra/format.h>
-#include <vppinfra/vector/test/test.h>
+#include <vppinfra/test/test.h>
#include <vppinfra/error.h>
test_main_t test_main;
diff --git a/src/vppinfra/vector/test/test.h b/src/vppinfra/test/test.h
index 7d54d80c6ec..7d54d80c6ec 100644
--- a/src/vppinfra/vector/test/test.h
+++ b/src/vppinfra/test/test.h
diff --git a/src/vppinfra/vector/test/toeplitz.c b/src/vppinfra/test/toeplitz.c
index fbe4275f9fa..c1bd13fae8c 100644
--- a/src/vppinfra/vector/test/toeplitz.c
+++ b/src/vppinfra/test/toeplitz.c
@@ -3,7 +3,7 @@
*/
#include <vppinfra/format.h>
-#include <vppinfra/vector/test/test.h>
+#include <vppinfra/test/test.h>
#include <vppinfra/vector/toeplitz.h>
/* secret key and test cases taken from: