diff options
author | Christophe Milard <christophe.milard@linaro.org> | 2015-06-17 23:51:44 +0200 |
---|---|---|
committer | Mike Holmes <mike.holmes@linaro.org> | 2015-06-22 08:12:42 -0400 |
commit | de63f41160be07f4d6c993475df633ea82aab2cd (patch) | |
tree | 11ef4086f89de7a47f17eca754087f98505b155d /test | |
parent | 8291d12e235d54975391d28c63a9aed553d79471 (diff) |
validation: creating own dir and lib for crypto
Module crypto now gets its own directory and create its own lib
(currentely only containing its executable)
Signed-off-by: Christophe Milard <christophe.milard@linaro.org>
Reviewed-by: Stuart Haslam <stuart.haslam@linaro.org>
Signed-off-by: Mike Holmes <mike.holmes@linaro.org>
Diffstat (limited to 'test')
-rw-r--r-- | test/validation/.gitignore | 1 | ||||
-rw-r--r-- | test/validation/Makefile.am | 12 | ||||
-rw-r--r-- | test/validation/crypto/.gitignore | 2 | ||||
-rw-r--r-- | test/validation/crypto/Makefile.am | 9 | ||||
-rw-r--r-- | test/validation/crypto/crypto.c (renamed from test/validation/odp_crypto.c) | 9 | ||||
-rw-r--r-- | test/validation/crypto/crypto.h | 7 | ||||
-rw-r--r-- | test/validation/crypto/crypto_main.c | 12 |
7 files changed, 37 insertions, 15 deletions
diff --git a/test/validation/.gitignore b/test/validation/.gitignore index 7d3a0fc..765c8b0 100644 --- a/test/validation/.gitignore +++ b/test/validation/.gitignore @@ -4,7 +4,6 @@ odp_ver_abt_log_dbg odp_buffer odp_classification odp_cpumask -odp_crypto odp_init odp_init_abort odp_init_log diff --git a/test/validation/Makefile.am b/test/validation/Makefile.am index e40bc7d..3992e8f 100644 --- a/test/validation/Makefile.am +++ b/test/validation/Makefile.am @@ -7,7 +7,6 @@ AM_LDFLAGS += -static EXECUTABLES = odp_buffer \ odp_classification \ odp_cpumask \ - odp_crypto \ odp_init \ odp_init_abort \ odp_init_log \ @@ -24,7 +23,8 @@ EXECUTABLES = odp_buffer \ odp_ver_abt_log_dbg if test_vald -TESTS = $(EXECUTABLES) +TESTS = $(EXECUTABLES) \ + crypto/crypto_main endif bin_PROGRAMS = $(EXECUTABLES) $(COMPILE_ONLY) @@ -38,10 +38,6 @@ dist_odp_classification_SOURCES = classification/odp_classification_tests.c \ classification/odp_classification_basic.c \ odp_classification.c odp_crypto_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/crypto -odp_crypto_LDADD = $(top_builddir)/test/validation/common/libcunit_common.a \ - $(LIB)/libodp.la -dist_odp_crypto_SOURCES = crypto/odp_crypto_test_inp.c \ - odp_crypto.c dist_odp_init_SOURCES = init/odp_init.c dist_odp_init_abort_SOURCES = init/odp_init_abort.c dist_odp_init_log_SOURCES = init/odp_init_log.c @@ -61,5 +57,7 @@ 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_MODULES = pktio +ODP_MODULES = crypto \ + pktio + SUBDIRS = common $(ODP_MODULES) diff --git a/test/validation/crypto/.gitignore b/test/validation/crypto/.gitignore new file mode 100644 index 0000000..998752b --- /dev/null +++ b/test/validation/crypto/.gitignore @@ -0,0 +1,2 @@ +crypto_main +libcrypto.a diff --git a/test/validation/crypto/Makefile.am b/test/validation/crypto/Makefile.am new file mode 100644 index 0000000..0ce3aa5 --- /dev/null +++ b/test/validation/crypto/Makefile.am @@ -0,0 +1,9 @@ +include ../Makefile.inc + +noinst_LIBRARIES = libcrypto.a +libcrypto_a_SOURCES = crypto.c \ + odp_crypto_test_inp.c + +bin_PROGRAMS = crypto_main +dist_crypto_main_SOURCES = crypto_main.c +crypto_main_LDADD = libcrypto.a $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/odp_crypto.c b/test/validation/crypto/crypto.c index 56f9938..899fb51 100644 --- a/test/validation/odp_crypto.c +++ b/test/validation/crypto/crypto.c @@ -7,6 +7,7 @@ #include <odp.h> #include "odp_cunit_common.h" #include "odp_crypto_test_inp.h" +#include "crypto.h" #define SHM_PKT_POOL_SIZE (512 * 2048 * 2) #define SHM_PKT_POOL_BUF_SIZE (1024 * 32) @@ -93,13 +94,7 @@ int tests_global_term(void) return 0; } -static int crypto_main(void) +int crypto_main(void) { return odp_cunit_run(crypto_suites); } - -/* the following main function will be separated when lib is created */ -int main(void) -{ - return crypto_main(); -} diff --git a/test/validation/crypto/crypto.h b/test/validation/crypto/crypto.h new file mode 100644 index 0000000..aacb511 --- /dev/null +++ b/test/validation/crypto/crypto.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +int crypto_main(void); diff --git a/test/validation/crypto/crypto_main.c b/test/validation/crypto/crypto_main.c new file mode 100644 index 0000000..644e666 --- /dev/null +++ b/test/validation/crypto/crypto_main.c @@ -0,0 +1,12 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include "crypto.h" + +int main(void) +{ + return crypto_main(); +} |