validation: crypto: split crypto and random tests

Crypto and Random are separate API modules now, so split tests
accordingly.

Signed-off-by: Taras Kondratiuk <taras.kondratiuk@linaro.org>
Reviewed-and-tested-by: Robbie King <robking@cisco.com>
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>

6 files changed, 42 insertions, 57 deletions

diff --git a/test/validation/.gitignore b/test/validation/.gitignore
index 1a69f8952..2eab34c26 100644
--- a/test/validation/.gitignore
+++ b/test/validation/.gitignore
@@ -1,19 +1,20 @@
 *.log
 *.trs
+odp_buffer
+odp_classification
+odp_crypto
+odp_errno
 odp_init
 odp_init_abort
 odp_init_log
+odp_packet
+odp_pktio
+odp_pool
 odp_queue
-odp_crypto
-odp_classification
+odp_random
 odp_schedule
 odp_shm
+odp_synchronizers
 odp_system
-odp_pktio
-odp_buffer
-odp_packet
-odp_pool
-odp_timer
 odp_time
-odp_synchronizers
-odp_errno
+odp_timer
diff --git a/test/validation/Makefile.am b/test/validation/Makefile.am
index fe43084fb..0833181b6 100644
--- a/test/validation/Makefile.am
+++ b/test/validation/Makefile.am
@@ -14,6 +14,7 @@ EXECUTABLES = odp_buffer \
 	      odp_packet \
 	      odp_pool \
 	      odp_queue \
+	      odp_random \
 	      odp_schedule \
 	      odp_shm \
 	      odp_system \
@@ -43,12 +44,12 @@ dist_odp_classification_SOURCES = classification/odp_classification_tests.c \
 odp_crypto_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/crypto
 dist_odp_crypto_SOURCES = crypto/odp_crypto_test_async_inp.c \
 			  crypto/odp_crypto_test_sync_inp.c \
-			  crypto/odp_crypto_test_rng.c \
 			  odp_crypto.c $(ODP_CU_COMMON)
 dist_odp_init_SOURCES	= odp_init.c
 dist_odp_init_abort_SOURCES = odp_init_abort.c
 dist_odp_init_log_SOURCES = odp_init_log.c
 dist_odp_queue_SOURCES	= odp_queue.c $(ODP_CU_COMMON)
+dist_odp_random_SOURCES = odp_random.c $(ODP_CU_COMMON)
 dist_odp_schedule_SOURCES = odp_schedule.c $(ODP_CU_COMMON)
 dist_odp_shm_SOURCES	= odp_shm.c $(ODP_CU_COMMON)
 dist_odp_system_SOURCES = odp_system.c $(ODP_CU_COMMON)
diff --git a/test/validation/crypto/odp_crypto_test_rng.c b/test/validation/crypto/odp_crypto_test_rng.c
deleted file mode 100644
index 6a4ad1716..000000000
--- a/test/validation/crypto/odp_crypto_test_rng.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright (c) 2014, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
- */
-#include <odp.h>
-#include <CUnit/Basic.h>
-#include <CUnit/TestDB.h>
-#include "test_vectors_len.h"
-
-/*
- * This test verifies that HW random number generator is able
- * to produce an IV for TDES_CBC cipher algorithm.
- * */
-#define RNG_GET_SIZE	"RNG_GET_SIZE"
-static void rng_get_size(void)
-{
-	int32_t ret;
-	uint8_t buf[TDES_CBC_IV_LEN];
-
-	ret = odp_random_data(buf, sizeof(buf), false);
-	CU_ASSERT(ret == TDES_CBC_IV_LEN);
-}
-
-CU_TestInfo test_rng[] = {
-	{ RNG_GET_SIZE, rng_get_size },
-	CU_TEST_INFO_NULL,
-};
diff --git a/test/validation/crypto/odp_crypto_test_rng.h b/test/validation/crypto/odp_crypto_test_rng.h
deleted file mode 100644
index 16909b33d..000000000
--- a/test/validation/crypto/odp_crypto_test_rng.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright (c) 2014, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
- */
-#ifndef ODP_CRYPTO_TEST_RNG_
-#define ODP_CRYPTO_TEST_RNG_
-
-#include "CUnit/TestDB.h"
-
-/* Suite name */
-#define ODP_CRYPTO_RNG    "ODP_CRYPTO_RNG"
-
-/* Suite test array */
-extern CU_TestInfo test_rng[];
-
-#endif
diff --git a/test/validation/odp_crypto.c b/test/validation/odp_crypto.c
index fbe5dbbf9..6cb5695e5 100644
--- a/test/validation/odp_crypto.c
+++ b/test/validation/odp_crypto.c
@@ -8,7 +8,6 @@
 #include "odp_cunit_common.h"
 #include "odp_crypto_test_async_inp.h"
 #include "odp_crypto_test_sync_inp.h"
-#include "odp_crypto_test_rng.h"
 
 #define SHM_PKT_POOL_SIZE	(512*2048*2)
 #define SHM_PKT_POOL_BUF_SIZE	(1024 * 32)
@@ -19,7 +18,6 @@
 CU_SuiteInfo odp_testsuites[] = {
 	{ODP_CRYPTO_SYNC_INP, NULL, NULL, NULL, NULL, test_array_sync },
 	{ODP_CRYPTO_ASYNC_INP, NULL, NULL, NULL, NULL, test_array_async },
-	{ODP_CRYPTO_RNG, NULL, NULL, NULL, NULL, test_rng },
 	CU_SUITE_INFO_NULL,
 };
 
diff --git a/test/validation/odp_random.c b/test/validation/odp_random.c
new file mode 100644
index 000000000..ebc9705e7
--- /dev/null
+++ b/test/validation/odp_random.c
@@ -0,0 +1,30 @@
+/* Copyright (c) 2015, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier:     BSD-3-Clause
+ */
+
+#include <odp.h>
+#include <odp_cunit_common.h>
+
+/* Helper macro for CU_TestInfo initialization */
+#define _CU_TEST_INFO(test_func) {#test_func, test_func}
+
+static void random_get_size(void)
+{
+	int32_t ret;
+	uint8_t buf[32];
+
+	ret = odp_random_data(buf, sizeof(buf), false);
+	CU_ASSERT(ret == sizeof(buf));
+}
+
+CU_TestInfo test_odp_random[] = {
+	_CU_TEST_INFO(random_get_size),
+	CU_TEST_INFO_NULL,
+};
+
+CU_SuiteInfo odp_testsuites[] = {
+	{"Random", NULL, NULL, NULL, NULL, test_odp_random},
+	CU_SUITE_INFO_NULL,
+};