vppinfra: widen the scope of test_vector_funcs

Location changed and binary renamed to test_infra
Also it is built by default.

Type: improvement
Change-Id: I27cd97f274501ceb7a01213e2bc9676cea00f39c
Signed-off-by: Damjan Marion <damarion@cisco.com>

diff --git a/src/vppinfra/CMakeLists.txt b/src/vppinfra/CMakeLists.txt
index d7445b0..4095133 100644 (file)
--- 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
similarity index 99%
rename from src/vppinfra/vector/test/array_mask.c
rename to src/vppinfra/test/array_mask.c
index 904bb21..c3b475c 100644 (file)
--- 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
similarity index 99%
rename from src/vppinfra/vector/test/compress.c
rename to src/vppinfra/test/compress.c
index 4f3fd53..7fdc3f8 100644 (file)
--- 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
similarity index 99%
rename from src/vppinfra/vector/test/count_equal.c
rename to src/vppinfra/test/count_equal.c
index c57b027..942c220 100644 (file)
--- 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
similarity index 97%
rename from src/vppinfra/vector/test/index_to_ptr.c
rename to src/vppinfra/test/index_to_ptr.c
index 7ee3b94..06b621c 100644 (file)
--- 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
similarity index 99%
rename from src/vppinfra/vector/test/ip_csum.c
rename to src/vppinfra/test/ip_csum.c
index 17a6065..9387336 100644 (file)
--- 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
similarity index 98%
rename from src/vppinfra/vector/test/mask_compare.c
rename to src/vppinfra/test/mask_compare.c
index 70608e1..738b008 100644 (file)
--- 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
similarity index 99%
rename from src/vppinfra/vector/test/memcpy_x86_64.c
rename to src/vppinfra/test/memcpy_x86_64.c
index edb32d0..4d9525d 100644 (file)
--- 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
similarity index 99%
rename from src/vppinfra/vector/test/sha2.c
rename to src/vppinfra/test/sha2.c
index 8136579..9b4abbe 100644 (file)
--- 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
similarity index 99%
rename from src/vppinfra/vector/test/test.c
rename to src/vppinfra/test/test.c
index dc5651c..15ea6fd 100644 (file)
--- 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
similarity index 100%
rename from src/vppinfra/vector/test/test.h
rename to src/vppinfra/test/test.h

diff --git a/src/vppinfra/vector/test/toeplitz.c b/src/vppinfra/test/toeplitz.c
similarity index 99%
rename from src/vppinfra/vector/test/toeplitz.c
rename to src/vppinfra/test/toeplitz.c
index fbe4275..c1bd13f 100644 (file)
--- 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: