unit-tests: Move test suites to its own subfolder

diff --git a/src/libstrongswan/tests/Makefile.am b/src/libstrongswan/tests/Makefile.am
index 994619ef66649b724c5128ba34b8a297caadf2c3..54ceaf53b44580102b4530740c119175d34c80b9 100644 (file)
--- a/src/libstrongswan/tests/Makefile.am
+++ b/src/libstrongswan/tests/Makefile.am
@@ -4,11 +4,25 @@ check_PROGRAMS = $(TESTS)
 
 test_runner_SOURCES = \
   test_runner.c test_runner.h test_suite.h \
-  test_linked_list.c test_enumerator.c test_linked_list_enumerator.c \
-  test_bio_reader.c test_bio_writer.c test_chunk.c test_enum.c test_hashtable.c \
-  test_identification.c test_threading.c test_utils.c test_vectors.c \
-  test_array.c test_ecdsa.c test_rsa.c test_host.c test_printf.c test_pen.c \
-  test_asn1.c
+  suites/test_linked_list.c \
+  suites/test_enumerator.c \
+  suites/test_linked_list_enumerator.c \
+  suites/test_bio_reader.c \
+  suites/test_bio_writer.c \
+  suites/test_chunk.c \
+  suites/test_enum.c \
+  suites/test_hashtable.c \
+  suites/test_identification.c \
+  suites/test_threading.c \
+  suites/test_utils.c \
+  suites/test_vectors.c \
+  suites/test_array.c \
+  suites/test_ecdsa.c \
+  suites/test_rsa.c \
+  suites/test_host.c \
+  suites/test_pen.c \
+  suites/test_asn1.c \
+  suites/test_printf.c
 
 test_runner_CFLAGS = \
   -I$(top_srcdir)/src/libstrongswan \

diff --git a/src/libstrongswan/tests/test_array.c b/src/libstrongswan/tests/suites/test_array.c
similarity index 100%
rename from src/libstrongswan/tests/test_array.c
rename to src/libstrongswan/tests/suites/test_array.c

diff --git a/src/libstrongswan/tests/test_asn1.c b/src/libstrongswan/tests/suites/test_asn1.c
similarity index 100%
rename from src/libstrongswan/tests/test_asn1.c
rename to src/libstrongswan/tests/suites/test_asn1.c

diff --git a/src/libstrongswan/tests/test_bio_reader.c b/src/libstrongswan/tests/suites/test_bio_reader.c
similarity index 99%
rename from src/libstrongswan/tests/test_bio_reader.c
rename to src/libstrongswan/tests/suites/test_bio_reader.c
index 45b20db00118a5d155d4fbcd4ff2e865f726c3c5..6a9743d62265c4a65c38b230b7a108a4b289ad73 100644 (file)
--- a/src/libstrongswan/tests/test_bio_reader.c
+++ b/src/libstrongswan/tests/suites/test_bio_reader.c
@@ -329,7 +329,7 @@ END_TEST
  */
 
 #define assert_read_data_len(bits) ({ \
-       bio_reader_t *reader; \
+       bio_reader_t *reader; \
        chunk_t read, data; \
        int i, len = bits / 8; \
        data = chunk_empty; \

diff --git a/src/libstrongswan/tests/test_bio_writer.c b/src/libstrongswan/tests/suites/test_bio_writer.c
similarity index 99%
rename from src/libstrongswan/tests/test_bio_writer.c
rename to src/libstrongswan/tests/suites/test_bio_writer.c
index 665cd2d7c3b550eb9b4d57766f4458021f3e7c04..e74288eb72ea08a763eb663657eb3c9f8beaf3d4 100644 (file)
--- a/src/libstrongswan/tests/test_bio_writer.c
+++ b/src/libstrongswan/tests/suites/test_bio_writer.c
@@ -181,7 +181,7 @@ END_TEST
  */
 
 #define assert_write_data_len(init, bits) ({ \
-       bio_writer_t *writer; \
+       bio_writer_t *writer; \
        chunk_t buf, data; \
        int i, len = bits / 8; \
        writer = bio_writer_create(init); \
@@ -240,7 +240,7 @@ END_TEST
  */
 
 #define assert_wrap_data(init, bits) ({ \
-       bio_writer_t *writer; \
+       bio_writer_t *writer; \
        chunk_t buf, data; \
        int i, len = bits / 8; \
        writer = bio_writer_create(init); \

diff --git a/src/libstrongswan/tests/test_chunk.c b/src/libstrongswan/tests/suites/test_chunk.c
similarity index 100%
rename from src/libstrongswan/tests/test_chunk.c
rename to src/libstrongswan/tests/suites/test_chunk.c

diff --git a/src/libstrongswan/tests/test_ecdsa.c b/src/libstrongswan/tests/suites/test_ecdsa.c
similarity index 100%
rename from src/libstrongswan/tests/test_ecdsa.c
rename to src/libstrongswan/tests/suites/test_ecdsa.c

diff --git a/src/libstrongswan/tests/test_enum.c b/src/libstrongswan/tests/suites/test_enum.c
similarity index 100%
rename from src/libstrongswan/tests/test_enum.c
rename to src/libstrongswan/tests/suites/test_enum.c

diff --git a/src/libstrongswan/tests/test_enumerator.c b/src/libstrongswan/tests/suites/test_enumerator.c
similarity index 100%
rename from src/libstrongswan/tests/test_enumerator.c
rename to src/libstrongswan/tests/suites/test_enumerator.c

diff --git a/src/libstrongswan/tests/test_hashtable.c b/src/libstrongswan/tests/suites/test_hashtable.c
similarity index 100%
rename from src/libstrongswan/tests/test_hashtable.c
rename to src/libstrongswan/tests/suites/test_hashtable.c

diff --git a/src/libstrongswan/tests/test_host.c b/src/libstrongswan/tests/suites/test_host.c
similarity index 100%
rename from src/libstrongswan/tests/test_host.c
rename to src/libstrongswan/tests/suites/test_host.c

diff --git a/src/libstrongswan/tests/test_identification.c b/src/libstrongswan/tests/suites/test_identification.c
similarity index 100%
rename from src/libstrongswan/tests/test_identification.c
rename to src/libstrongswan/tests/suites/test_identification.c

diff --git a/src/libstrongswan/tests/test_linked_list.c b/src/libstrongswan/tests/suites/test_linked_list.c
similarity index 100%
rename from src/libstrongswan/tests/test_linked_list.c
rename to src/libstrongswan/tests/suites/test_linked_list.c

diff --git a/src/libstrongswan/tests/test_linked_list_enumerator.c b/src/libstrongswan/tests/suites/test_linked_list_enumerator.c
similarity index 100%
rename from src/libstrongswan/tests/test_linked_list_enumerator.c
rename to src/libstrongswan/tests/suites/test_linked_list_enumerator.c

diff --git a/src/libstrongswan/tests/test_pen.c b/src/libstrongswan/tests/suites/test_pen.c
similarity index 100%
rename from src/libstrongswan/tests/test_pen.c
rename to src/libstrongswan/tests/suites/test_pen.c

diff --git a/src/libstrongswan/tests/test_printf.c b/src/libstrongswan/tests/suites/test_printf.c
similarity index 100%
rename from src/libstrongswan/tests/test_printf.c
rename to src/libstrongswan/tests/suites/test_printf.c

diff --git a/src/libstrongswan/tests/test_rsa.c b/src/libstrongswan/tests/suites/test_rsa.c
similarity index 100%
rename from src/libstrongswan/tests/test_rsa.c
rename to src/libstrongswan/tests/suites/test_rsa.c

diff --git a/src/libstrongswan/tests/test_threading.c b/src/libstrongswan/tests/suites/test_threading.c
similarity index 100%
rename from src/libstrongswan/tests/test_threading.c
rename to src/libstrongswan/tests/suites/test_threading.c

diff --git a/src/libstrongswan/tests/test_utils.c b/src/libstrongswan/tests/suites/test_utils.c
similarity index 100%
rename from src/libstrongswan/tests/test_utils.c
rename to src/libstrongswan/tests/suites/test_utils.c

diff --git a/src/libstrongswan/tests/test_vectors.c b/src/libstrongswan/tests/suites/test_vectors.c
similarity index 100%
rename from src/libstrongswan/tests/test_vectors.c
rename to src/libstrongswan/tests/suites/test_vectors.c