From: Dmitry Eremin-Solenikov <dmitry.ereminsoleni...@linaro.org> All tests in test/ are now common to all platforms, so no point in specifying that via (the only) common_plat subdirectory inside test dir.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsoleni...@linaro.org> --- /** Email created from pull request 213 (lumag:plat-def) ** https://github.com/Linaro/odp/pull/213 ** Patch: https://github.com/Linaro/odp/pull/213.patch ** Base sha: a63f25ff2994b2df78c24f1f8b63d0e06628eb68 ** Merge commit sha: d50e2e291ff11c1319e66c699d2f82260d59c383 **/ platform/linux-generic/test/Makefile.am | 2 +- .../test/performance/odp_scheduling_run_proc.sh | 2 +- .../test/validation/api/pktio/pktio_run.sh | 2 +- .../test/validation/api/pktio/pktio_run_dpdk.sh | 2 +- .../test/validation/api/pktio/pktio_run_netmap.sh | 2 +- .../test/validation/api/pktio/pktio_run_pcap.sh | 2 +- .../test/validation/api/pktio/pktio_run_tap.sh | 2 +- test/Makefile.am | 2 +- test/common_plat/Makefile.am | 1 - test/common_plat/m4/configure.m4 | 33 -------------------- test/m4/configure.m4 | 34 +++++++++++++++++++-- test/{common_plat => }/m4/miscellaneous.m4 | 0 test/{common_plat => }/m4/performance.m4 | 0 test/{common_plat => }/m4/validation.m4 | 0 test/{common_plat => }/miscellaneous/.gitignore | 0 test/{common_plat => }/miscellaneous/Makefile.am | 0 .../miscellaneous/odp_api_from_cpp.cpp | 0 test/{common_plat => }/performance/.gitignore | 0 test/{common_plat => }/performance/Makefile.am | 0 test/{common_plat => }/performance/dummy_crc.h | 0 .../performance/odp_bench_packet.c | 0 test/{common_plat => }/performance/odp_crypto.c | 0 test/{common_plat => }/performance/odp_l2fwd.c | 0 .../{common_plat => }/performance/odp_l2fwd_run.sh | 4 +-- .../performance/odp_pktio_ordered.c | 0 .../performance/odp_pktio_ordered_run.sh | 0 .../{common_plat => }/performance/odp_pktio_perf.c | 0 .../performance/odp_sched_latency.c | 0 .../performance/odp_sched_latency_run.sh | 0 .../{common_plat => }/performance/odp_scheduling.c | 0 .../performance/odp_scheduling_run.sh | 0 test/{common_plat => }/performance/udp64.pcap | Bin test/{common_plat => }/validation/Makefile.am | 0 test/{common_plat => }/validation/api/.gitignore | 0 test/{common_plat => }/validation/api/Makefile.am | 2 +- test/{common_plat => }/validation/api/Makefile.inc | 0 test/{common_plat => }/validation/api/README | 0 .../validation/api/atomic/.gitignore | 0 .../validation/api/atomic/Makefile.am | 0 .../validation/api/atomic/atomic.c | 0 .../validation/api/atomic/atomic.h | 0 .../validation/api/atomic/atomic_main.c | 0 .../validation/api/barrier/.gitignore | 0 .../validation/api/barrier/Makefile.am | 0 .../validation/api/barrier/barrier.c | 0 .../validation/api/barrier/barrier.h | 0 .../validation/api/barrier/barrier_main.c | 0 .../validation/api/buffer/.gitignore | 0 .../validation/api/buffer/Makefile.am | 0 .../validation/api/buffer/buffer.c | 0 .../validation/api/buffer/buffer.h | 0 .../validation/api/buffer/buffer_main.c | 0 .../validation/api/classification/.gitignore | 0 .../validation/api/classification/Makefile.am | 0 .../validation/api/classification/classification.c | 0 .../validation/api/classification/classification.h | 0 .../api/classification/classification_main.c | 0 .../api/classification/odp_classification_basic.c | 0 .../api/classification/odp_classification_common.c | 0 .../classification/odp_classification_test_pmr.c | 0 .../api/classification/odp_classification_tests.c | 0 .../classification/odp_classification_testsuites.h | 0 .../validation/api/cpumask/.gitignore | 0 .../validation/api/cpumask/Makefile.am | 0 .../validation/api/cpumask/cpumask.c | 0 .../validation/api/cpumask/cpumask.h | 0 .../validation/api/cpumask/cpumask_main.c | 0 .../validation/api/crypto/.gitignore | 0 .../validation/api/crypto/Makefile.am | 0 .../validation/api/crypto/crypto.c | 0 .../validation/api/crypto/crypto.h | 0 .../validation/api/crypto/crypto_main.c | 0 .../validation/api/crypto/odp_crypto_test_inp.c | 0 .../validation/api/crypto/odp_crypto_test_inp.h | 0 .../validation/api/crypto/test_vectors.h | 0 .../validation/api/crypto/test_vectors_len.h | 0 .../validation/api/errno/.gitignore | 0 .../validation/api/errno/Makefile.am | 0 .../{common_plat => }/validation/api/errno/errno.c | 0 .../{common_plat => }/validation/api/errno/errno.h | 0 .../validation/api/errno/errno_main.c | 0 .../validation/api/hash/.gitignore | 0 .../validation/api/hash/Makefile.am | 0 test/{common_plat => }/validation/api/hash/hash.c | 0 test/{common_plat => }/validation/api/hash/hash.h | 0 .../validation/api/hash/hash_main.c | 0 .../validation/api/init/.gitignore | 0 .../validation/api/init/Makefile.am | 0 test/{common_plat => }/validation/api/init/init.c | 0 test/{common_plat => }/validation/api/init/init.h | 0 .../validation/api/init/init_main_abort.c | 0 .../validation/api/init/init_main_log.c | 0 .../validation/api/init/init_main_ok.c | 0 .../validation/api/lock/.gitignore | 0 .../validation/api/lock/Makefile.am | 0 test/{common_plat => }/validation/api/lock/lock.c | 0 test/{common_plat => }/validation/api/lock/lock.h | 0 .../validation/api/lock/lock_main.c | 0 .../validation/api/packet/.gitignore | 0 .../validation/api/packet/Makefile.am | 0 .../validation/api/packet/packet.c | 0 .../validation/api/packet/packet.h | 0 .../validation/api/packet/packet_main.c | 0 .../validation/api/pktio/.gitignore | 0 .../validation/api/pktio/Makefile.am | 0 .../validation/api/pktio/parser.c | 0 .../validation/api/pktio/parser.h | 0 .../{common_plat => }/validation/api/pktio/pktio.c | 0 .../{common_plat => }/validation/api/pktio/pktio.h | 0 .../validation/api/pktio/pktio_main.c | 0 .../validation/api/pool/.gitignore | 0 .../validation/api/pool/Makefile.am | 0 test/{common_plat => }/validation/api/pool/pool.c | 0 test/{common_plat => }/validation/api/pool/pool.h | 0 .../validation/api/pool/pool_main.c | 0 .../validation/api/queue/.gitignore | 0 .../validation/api/queue/Makefile.am | 0 .../{common_plat => }/validation/api/queue/queue.c | 0 .../{common_plat => }/validation/api/queue/queue.h | 0 .../validation/api/queue/queue_main.c | 0 .../validation/api/random/.gitignore | 0 .../validation/api/random/Makefile.am | 0 .../validation/api/random/random.c | 0 .../validation/api/random/random.h | 0 .../validation/api/random/random_main.c | 0 .../validation/api/scheduler/.gitignore | 0 .../validation/api/scheduler/Makefile.am | 0 .../validation/api/scheduler/scheduler.c | 0 .../validation/api/scheduler/scheduler.h | 0 .../validation/api/scheduler/scheduler_main.c | 0 .../validation/api/shmem/.gitignore | 0 .../validation/api/shmem/Makefile.am | 0 .../{common_plat => }/validation/api/shmem/shmem.c | 0 .../{common_plat => }/validation/api/shmem/shmem.h | 0 .../validation/api/shmem/shmem_main.c | 0 .../validation/api/std_clib/.gitignore | 0 .../validation/api/std_clib/Makefile.am | 0 .../validation/api/std_clib/std_clib.c | 0 .../validation/api/std_clib/std_clib.h | 0 .../validation/api/std_clib/std_clib_main.c | 0 .../validation/api/system/.gitignore | 0 .../validation/api/system/Makefile.am | 0 .../validation/api/system/system.c | 0 .../validation/api/system/system.h | 0 .../validation/api/system/system_main.c | 0 .../validation/api/thread/.gitignore | 0 .../validation/api/thread/Makefile.am | 0 .../validation/api/thread/thread.c | 0 .../validation/api/thread/thread.h | 0 .../validation/api/thread/thread_main.c | 0 .../validation/api/time/.gitignore | 0 .../validation/api/time/Makefile.am | 0 test/{common_plat => }/validation/api/time/time.c | 0 test/{common_plat => }/validation/api/time/time.sh | 2 +- .../validation/api/time/time_main.c | 0 .../validation/api/time/time_test.h | 0 .../validation/api/timer/.gitignore | 0 .../validation/api/timer/Makefile.am | 0 .../{common_plat => }/validation/api/timer/timer.c | 0 .../{common_plat => }/validation/api/timer/timer.h | 0 .../validation/api/timer/timer_main.c | 0 .../validation/api/traffic_mngr/.gitignore | 0 .../validation/api/traffic_mngr/Makefile.am | 0 .../validation/api/traffic_mngr/traffic_mngr.c | 0 .../validation/api/traffic_mngr/traffic_mngr.h | 0 .../validation/api/traffic_mngr/traffic_mngr.sh | 2 +- .../api/traffic_mngr/traffic_mngr_main.c | 0 167 files changed, 45 insertions(+), 49 deletions(-) delete mode 100644 test/common_plat/Makefile.am delete mode 100644 test/common_plat/m4/configure.m4 rename test/{common_plat => }/m4/miscellaneous.m4 (100%) rename test/{common_plat => }/m4/performance.m4 (100%) rename test/{common_plat => }/m4/validation.m4 (100%) rename test/{common_plat => }/miscellaneous/.gitignore (100%) rename test/{common_plat => }/miscellaneous/Makefile.am (100%) rename test/{common_plat => }/miscellaneous/odp_api_from_cpp.cpp (100%) rename test/{common_plat => }/performance/.gitignore (100%) rename test/{common_plat => }/performance/Makefile.am (100%) rename test/{common_plat => }/performance/dummy_crc.h (100%) rename test/{common_plat => }/performance/odp_bench_packet.c (100%) rename test/{common_plat => }/performance/odp_crypto.c (100%) rename test/{common_plat => }/performance/odp_l2fwd.c (100%) rename test/{common_plat => }/performance/odp_l2fwd_run.sh (95%) rename test/{common_plat => }/performance/odp_pktio_ordered.c (100%) rename test/{common_plat => }/performance/odp_pktio_ordered_run.sh (100%) rename test/{common_plat => }/performance/odp_pktio_perf.c (100%) rename test/{common_plat => }/performance/odp_sched_latency.c (100%) rename test/{common_plat => }/performance/odp_sched_latency_run.sh (100%) rename test/{common_plat => }/performance/odp_scheduling.c (100%) rename test/{common_plat => }/performance/odp_scheduling_run.sh (100%) rename test/{common_plat => }/performance/udp64.pcap (100%) rename test/{common_plat => }/validation/Makefile.am (100%) rename test/{common_plat => }/validation/api/.gitignore (100%) rename test/{common_plat => }/validation/api/Makefile.am (95%) rename test/{common_plat => }/validation/api/Makefile.inc (100%) rename test/{common_plat => }/validation/api/README (100%) rename test/{common_plat => }/validation/api/atomic/.gitignore (100%) rename test/{common_plat => }/validation/api/atomic/Makefile.am (100%) rename test/{common_plat => }/validation/api/atomic/atomic.c (100%) rename test/{common_plat => }/validation/api/atomic/atomic.h (100%) rename test/{common_plat => }/validation/api/atomic/atomic_main.c (100%) rename test/{common_plat => }/validation/api/barrier/.gitignore (100%) rename test/{common_plat => }/validation/api/barrier/Makefile.am (100%) rename test/{common_plat => }/validation/api/barrier/barrier.c (100%) rename test/{common_plat => }/validation/api/barrier/barrier.h (100%) rename test/{common_plat => }/validation/api/barrier/barrier_main.c (100%) rename test/{common_plat => }/validation/api/buffer/.gitignore (100%) rename test/{common_plat => }/validation/api/buffer/Makefile.am (100%) rename test/{common_plat => }/validation/api/buffer/buffer.c (100%) rename test/{common_plat => }/validation/api/buffer/buffer.h (100%) rename test/{common_plat => }/validation/api/buffer/buffer_main.c (100%) rename test/{common_plat => }/validation/api/classification/.gitignore (100%) rename test/{common_plat => }/validation/api/classification/Makefile.am (100%) rename test/{common_plat => }/validation/api/classification/classification.c (100%) rename test/{common_plat => }/validation/api/classification/classification.h (100%) rename test/{common_plat => }/validation/api/classification/classification_main.c (100%) rename test/{common_plat => }/validation/api/classification/odp_classification_basic.c (100%) rename test/{common_plat => }/validation/api/classification/odp_classification_common.c (100%) rename test/{common_plat => }/validation/api/classification/odp_classification_test_pmr.c (100%) rename test/{common_plat => }/validation/api/classification/odp_classification_tests.c (100%) rename test/{common_plat => }/validation/api/classification/odp_classification_testsuites.h (100%) rename test/{common_plat => }/validation/api/cpumask/.gitignore (100%) rename test/{common_plat => }/validation/api/cpumask/Makefile.am (100%) rename test/{common_plat => }/validation/api/cpumask/cpumask.c (100%) rename test/{common_plat => }/validation/api/cpumask/cpumask.h (100%) rename test/{common_plat => }/validation/api/cpumask/cpumask_main.c (100%) rename test/{common_plat => }/validation/api/crypto/.gitignore (100%) rename test/{common_plat => }/validation/api/crypto/Makefile.am (100%) rename test/{common_plat => }/validation/api/crypto/crypto.c (100%) rename test/{common_plat => }/validation/api/crypto/crypto.h (100%) rename test/{common_plat => }/validation/api/crypto/crypto_main.c (100%) rename test/{common_plat => }/validation/api/crypto/odp_crypto_test_inp.c (100%) rename test/{common_plat => }/validation/api/crypto/odp_crypto_test_inp.h (100%) rename test/{common_plat => }/validation/api/crypto/test_vectors.h (100%) rename test/{common_plat => }/validation/api/crypto/test_vectors_len.h (100%) rename test/{common_plat => }/validation/api/errno/.gitignore (100%) rename test/{common_plat => }/validation/api/errno/Makefile.am (100%) rename test/{common_plat => }/validation/api/errno/errno.c (100%) rename test/{common_plat => }/validation/api/errno/errno.h (100%) rename test/{common_plat => }/validation/api/errno/errno_main.c (100%) rename test/{common_plat => }/validation/api/hash/.gitignore (100%) rename test/{common_plat => }/validation/api/hash/Makefile.am (100%) rename test/{common_plat => }/validation/api/hash/hash.c (100%) rename test/{common_plat => }/validation/api/hash/hash.h (100%) rename test/{common_plat => }/validation/api/hash/hash_main.c (100%) rename test/{common_plat => }/validation/api/init/.gitignore (100%) rename test/{common_plat => }/validation/api/init/Makefile.am (100%) rename test/{common_plat => }/validation/api/init/init.c (100%) rename test/{common_plat => }/validation/api/init/init.h (100%) rename test/{common_plat => }/validation/api/init/init_main_abort.c (100%) rename test/{common_plat => }/validation/api/init/init_main_log.c (100%) rename test/{common_plat => }/validation/api/init/init_main_ok.c (100%) rename test/{common_plat => }/validation/api/lock/.gitignore (100%) rename test/{common_plat => }/validation/api/lock/Makefile.am (100%) rename test/{common_plat => }/validation/api/lock/lock.c (100%) rename test/{common_plat => }/validation/api/lock/lock.h (100%) rename test/{common_plat => }/validation/api/lock/lock_main.c (100%) rename test/{common_plat => }/validation/api/packet/.gitignore (100%) rename test/{common_plat => }/validation/api/packet/Makefile.am (100%) rename test/{common_plat => }/validation/api/packet/packet.c (100%) rename test/{common_plat => }/validation/api/packet/packet.h (100%) rename test/{common_plat => }/validation/api/packet/packet_main.c (100%) rename test/{common_plat => }/validation/api/pktio/.gitignore (100%) rename test/{common_plat => }/validation/api/pktio/Makefile.am (100%) rename test/{common_plat => }/validation/api/pktio/parser.c (100%) rename test/{common_plat => }/validation/api/pktio/parser.h (100%) rename test/{common_plat => }/validation/api/pktio/pktio.c (100%) rename test/{common_plat => }/validation/api/pktio/pktio.h (100%) rename test/{common_plat => }/validation/api/pktio/pktio_main.c (100%) rename test/{common_plat => }/validation/api/pool/.gitignore (100%) rename test/{common_plat => }/validation/api/pool/Makefile.am (100%) rename test/{common_plat => }/validation/api/pool/pool.c (100%) rename test/{common_plat => }/validation/api/pool/pool.h (100%) rename test/{common_plat => }/validation/api/pool/pool_main.c (100%) rename test/{common_plat => }/validation/api/queue/.gitignore (100%) rename test/{common_plat => }/validation/api/queue/Makefile.am (100%) rename test/{common_plat => }/validation/api/queue/queue.c (100%) rename test/{common_plat => }/validation/api/queue/queue.h (100%) rename test/{common_plat => }/validation/api/queue/queue_main.c (100%) rename test/{common_plat => }/validation/api/random/.gitignore (100%) rename test/{common_plat => }/validation/api/random/Makefile.am (100%) rename test/{common_plat => }/validation/api/random/random.c (100%) rename test/{common_plat => }/validation/api/random/random.h (100%) rename test/{common_plat => }/validation/api/random/random_main.c (100%) rename test/{common_plat => }/validation/api/scheduler/.gitignore (100%) rename test/{common_plat => }/validation/api/scheduler/Makefile.am (100%) rename test/{common_plat => }/validation/api/scheduler/scheduler.c (100%) rename test/{common_plat => }/validation/api/scheduler/scheduler.h (100%) rename test/{common_plat => }/validation/api/scheduler/scheduler_main.c (100%) rename test/{common_plat => }/validation/api/shmem/.gitignore (100%) rename test/{common_plat => }/validation/api/shmem/Makefile.am (100%) rename test/{common_plat => }/validation/api/shmem/shmem.c (100%) rename test/{common_plat => }/validation/api/shmem/shmem.h (100%) rename test/{common_plat => }/validation/api/shmem/shmem_main.c (100%) rename test/{common_plat => }/validation/api/std_clib/.gitignore (100%) rename test/{common_plat => }/validation/api/std_clib/Makefile.am (100%) rename test/{common_plat => }/validation/api/std_clib/std_clib.c (100%) rename test/{common_plat => }/validation/api/std_clib/std_clib.h (100%) rename test/{common_plat => }/validation/api/std_clib/std_clib_main.c (100%) rename test/{common_plat => }/validation/api/system/.gitignore (100%) rename test/{common_plat => }/validation/api/system/Makefile.am (100%) rename test/{common_plat => }/validation/api/system/system.c (100%) rename test/{common_plat => }/validation/api/system/system.h (100%) rename test/{common_plat => }/validation/api/system/system_main.c (100%) rename test/{common_plat => }/validation/api/thread/.gitignore (100%) rename test/{common_plat => }/validation/api/thread/Makefile.am (100%) rename test/{common_plat => }/validation/api/thread/thread.c (100%) rename test/{common_plat => }/validation/api/thread/thread.h (100%) rename test/{common_plat => }/validation/api/thread/thread_main.c (100%) rename test/{common_plat => }/validation/api/time/.gitignore (100%) rename test/{common_plat => }/validation/api/time/Makefile.am (100%) rename test/{common_plat => }/validation/api/time/time.c (100%) rename test/{common_plat => }/validation/api/time/time.sh (93%) rename test/{common_plat => }/validation/api/time/time_main.c (100%) rename test/{common_plat => }/validation/api/time/time_test.h (100%) rename test/{common_plat => }/validation/api/timer/.gitignore (100%) rename test/{common_plat => }/validation/api/timer/Makefile.am (100%) rename test/{common_plat => }/validation/api/timer/timer.c (100%) rename test/{common_plat => }/validation/api/timer/timer.h (100%) rename test/{common_plat => }/validation/api/timer/timer_main.c (100%) rename test/{common_plat => }/validation/api/traffic_mngr/.gitignore (100%) rename test/{common_plat => }/validation/api/traffic_mngr/Makefile.am (100%) rename test/{common_plat => }/validation/api/traffic_mngr/traffic_mngr.c (100%) rename test/{common_plat => }/validation/api/traffic_mngr/traffic_mngr.h (100%) rename test/{common_plat => }/validation/api/traffic_mngr/traffic_mngr.sh (93%) rename test/{common_plat => }/validation/api/traffic_mngr/traffic_mngr_main.c (100%) diff --git a/platform/linux-generic/test/Makefile.am b/platform/linux-generic/test/Makefile.am index c65a26fd7..1f4910ad2 100644 --- a/platform/linux-generic/test/Makefile.am +++ b/platform/linux-generic/test/Makefile.am @@ -1,5 +1,5 @@ include $(top_srcdir)/test/Makefile.inc -TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/common_plat/validation +TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/validation SUBDIRS = performance diff --git a/platform/linux-generic/test/performance/odp_scheduling_run_proc.sh b/platform/linux-generic/test/performance/odp_scheduling_run_proc.sh index a57df6c0b..598e5b837 100755 --- a/platform/linux-generic/test/performance/odp_scheduling_run_proc.sh +++ b/platform/linux-generic/test/performance/odp_scheduling_run_proc.sh @@ -9,7 +9,7 @@ # launched by 'make check' TEST_DIR="${TEST_DIR:-$(dirname $0)}" -PERFORMANCE="$TEST_DIR/../../../../test/common_plat/performance" +PERFORMANCE="$TEST_DIR/../../../../test/performance" ret=0 ALL=0 diff --git a/platform/linux-generic/test/validation/api/pktio/pktio_run.sh b/platform/linux-generic/test/validation/api/pktio/pktio_run.sh index 075929e8c..5b861bbbf 100755 --- a/platform/linux-generic/test/validation/api/pktio/pktio_run.sh +++ b/platform/linux-generic/test/validation/api/pktio/pktio_run.sh @@ -23,7 +23,7 @@ # running stand alone out of tree requires setting PATH PATH=${TEST_DIR}/api/pktio:$PATH PATH=$(dirname $0):$PATH -PATH=$(dirname $0)/../../../../../../test/common_plat/validation/api/pktio:$PATH +PATH=$(dirname $0)/../../../../../../test/validation/api/pktio:$PATH PATH=.:$PATH pktio_main_path=$(which pktio_main${EXEEXT}) diff --git a/platform/linux-generic/test/validation/api/pktio/pktio_run_dpdk.sh b/platform/linux-generic/test/validation/api/pktio/pktio_run_dpdk.sh index 0baf7e132..14759142d 100755 --- a/platform/linux-generic/test/validation/api/pktio/pktio_run_dpdk.sh +++ b/platform/linux-generic/test/validation/api/pktio/pktio_run_dpdk.sh @@ -23,7 +23,7 @@ # running stand alone out of tree requires setting PATH PATH=${TEST_DIR}/api/pktio:$PATH PATH=$(dirname $0):$PATH -PATH=$(dirname $0)/../../../../../../test/common_plat/validation/api/pktio:$PATH +PATH=$(dirname $0)/../../../../../../test/validation/api/pktio:$PATH PATH=.:$PATH pktio_main_path=$(which pktio_main${EXEEXT}) diff --git a/platform/linux-generic/test/validation/api/pktio/pktio_run_netmap.sh b/platform/linux-generic/test/validation/api/pktio/pktio_run_netmap.sh index bf4123767..610be3bdc 100755 --- a/platform/linux-generic/test/validation/api/pktio/pktio_run_netmap.sh +++ b/platform/linux-generic/test/validation/api/pktio/pktio_run_netmap.sh @@ -17,7 +17,7 @@ # running stand alone out of tree requires setting PATH PATH=${TEST_DIR}/api/pktio:$PATH PATH=$(dirname $0):$PATH -PATH=$(dirname $0)/../../../../../../test/common_plat/validation/api/pktio:$PATH +PATH=$(dirname $0)/../../../../../../test/validation/api/pktio:$PATH PATH=.:$PATH pktio_main_path=$(which pktio_main${EXEEXT}) diff --git a/platform/linux-generic/test/validation/api/pktio/pktio_run_pcap.sh b/platform/linux-generic/test/validation/api/pktio/pktio_run_pcap.sh index 4b5a0b3f1..bf9fc4560 100755 --- a/platform/linux-generic/test/validation/api/pktio/pktio_run_pcap.sh +++ b/platform/linux-generic/test/validation/api/pktio/pktio_run_pcap.sh @@ -17,7 +17,7 @@ # running stand alone out of tree requires setting PATH PATH=${TEST_DIR}/api/pktio:$PATH PATH=$(dirname $0):$PATH -PATH=$(dirname $0)/../../../../../../test/common_plat/validation/api/pktio:$PATH +PATH=$(dirname $0)/../../../../../../test/validation/api/pktio:$PATH PATH=.:$PATH pktio_main_path=$(which pktio_main${EXEEXT}) diff --git a/platform/linux-generic/test/validation/api/pktio/pktio_run_tap.sh b/platform/linux-generic/test/validation/api/pktio/pktio_run_tap.sh index e5b72335d..ecfe5a126 100755 --- a/platform/linux-generic/test/validation/api/pktio/pktio_run_tap.sh +++ b/platform/linux-generic/test/validation/api/pktio/pktio_run_tap.sh @@ -18,7 +18,7 @@ # running stand alone out of tree requires setting PATH PATH=${TEST_DIR}/api/pktio:$PATH PATH=$(dirname $0):$PATH -PATH=$(dirname $0)/../../../../../../test/common_plat/validation/api/pktio:$PATH +PATH=$(dirname $0)/../../../../../../test/validation/api/pktio:$PATH PATH=.:$PATH pktio_main_path=$(which pktio_main${EXEEXT}) diff --git a/test/Makefile.am b/test/Makefile.am index 67ae76aed..80c35f870 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1 +1 @@ -SUBDIRS = common_plat +SUBDIRS = performance miscellaneous validation diff --git a/test/common_plat/Makefile.am b/test/common_plat/Makefile.am deleted file mode 100644 index 80c35f870..000000000 --- a/test/common_plat/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = performance miscellaneous validation diff --git a/test/common_plat/m4/configure.m4 b/test/common_plat/m4/configure.m4 deleted file mode 100644 index e04737e18..000000000 --- a/test/common_plat/m4/configure.m4 +++ /dev/null @@ -1,33 +0,0 @@ -m4_include([test/common_plat/m4/miscellaneous.m4]) -m4_include([test/common_plat/m4/performance.m4]) -m4_include([test/common_plat/m4/validation.m4]) - -AC_CONFIG_FILES([test_common/Makefile - test/common_plat/Makefile - test/common_plat/miscellaneous/Makefile - test/common_plat/performance/Makefile - test/common_plat/validation/Makefile - test/common_plat/validation/api/atomic/Makefile - test/common_plat/validation/api/barrier/Makefile - test/common_plat/validation/api/buffer/Makefile - test/common_plat/validation/api/classification/Makefile - test/common_plat/validation/api/cpumask/Makefile - test/common_plat/validation/api/crypto/Makefile - test/common_plat/validation/api/errno/Makefile - test/common_plat/validation/api/hash/Makefile - test/common_plat/validation/api/init/Makefile - test/common_plat/validation/api/lock/Makefile - test/common_plat/validation/api/Makefile - test/common_plat/validation/api/packet/Makefile - test/common_plat/validation/api/pktio/Makefile - test/common_plat/validation/api/pool/Makefile - test/common_plat/validation/api/queue/Makefile - test/common_plat/validation/api/random/Makefile - test/common_plat/validation/api/scheduler/Makefile - test/common_plat/validation/api/shmem/Makefile - test/common_plat/validation/api/std_clib/Makefile - test/common_plat/validation/api/system/Makefile - test/common_plat/validation/api/thread/Makefile - test/common_plat/validation/api/time/Makefile - test/common_plat/validation/api/timer/Makefile - test/common_plat/validation/api/traffic_mngr/Makefile]) diff --git a/test/m4/configure.m4 b/test/m4/configure.m4 index 460e8449f..07ae1cf15 100644 --- a/test/m4/configure.m4 +++ b/test/m4/configure.m4 @@ -1,3 +1,33 @@ -m4_include([test/common_plat/m4/configure.m4]) +m4_include([test/m4/miscellaneous.m4]) +m4_include([test/m4/performance.m4]) +m4_include([test/m4/validation.m4]) -AC_CONFIG_FILES([test/Makefile]) +AC_CONFIG_FILES([test_common/Makefile + test/Makefile + test/miscellaneous/Makefile + test/performance/Makefile + test/validation/Makefile + test/validation/api/atomic/Makefile + test/validation/api/barrier/Makefile + test/validation/api/buffer/Makefile + test/validation/api/classification/Makefile + test/validation/api/cpumask/Makefile + test/validation/api/crypto/Makefile + test/validation/api/errno/Makefile + test/validation/api/hash/Makefile + test/validation/api/init/Makefile + test/validation/api/lock/Makefile + test/validation/api/Makefile + test/validation/api/packet/Makefile + test/validation/api/pktio/Makefile + test/validation/api/pool/Makefile + test/validation/api/queue/Makefile + test/validation/api/random/Makefile + test/validation/api/scheduler/Makefile + test/validation/api/shmem/Makefile + test/validation/api/std_clib/Makefile + test/validation/api/system/Makefile + test/validation/api/thread/Makefile + test/validation/api/time/Makefile + test/validation/api/timer/Makefile + test/validation/api/traffic_mngr/Makefile]) diff --git a/test/common_plat/m4/miscellaneous.m4 b/test/m4/miscellaneous.m4 similarity index 100% rename from test/common_plat/m4/miscellaneous.m4 rename to test/m4/miscellaneous.m4 diff --git a/test/common_plat/m4/performance.m4 b/test/m4/performance.m4 similarity index 100% rename from test/common_plat/m4/performance.m4 rename to test/m4/performance.m4 diff --git a/test/common_plat/m4/validation.m4 b/test/m4/validation.m4 similarity index 100% rename from test/common_plat/m4/validation.m4 rename to test/m4/validation.m4 diff --git a/test/common_plat/miscellaneous/.gitignore b/test/miscellaneous/.gitignore similarity index 100% rename from test/common_plat/miscellaneous/.gitignore rename to test/miscellaneous/.gitignore diff --git a/test/common_plat/miscellaneous/Makefile.am b/test/miscellaneous/Makefile.am similarity index 100% rename from test/common_plat/miscellaneous/Makefile.am rename to test/miscellaneous/Makefile.am diff --git a/test/common_plat/miscellaneous/odp_api_from_cpp.cpp b/test/miscellaneous/odp_api_from_cpp.cpp similarity index 100% rename from test/common_plat/miscellaneous/odp_api_from_cpp.cpp rename to test/miscellaneous/odp_api_from_cpp.cpp diff --git a/test/common_plat/performance/.gitignore b/test/performance/.gitignore similarity index 100% rename from test/common_plat/performance/.gitignore rename to test/performance/.gitignore diff --git a/test/common_plat/performance/Makefile.am b/test/performance/Makefile.am similarity index 100% rename from test/common_plat/performance/Makefile.am rename to test/performance/Makefile.am diff --git a/test/common_plat/performance/dummy_crc.h b/test/performance/dummy_crc.h similarity index 100% rename from test/common_plat/performance/dummy_crc.h rename to test/performance/dummy_crc.h diff --git a/test/common_plat/performance/odp_bench_packet.c b/test/performance/odp_bench_packet.c similarity index 100% rename from test/common_plat/performance/odp_bench_packet.c rename to test/performance/odp_bench_packet.c diff --git a/test/common_plat/performance/odp_crypto.c b/test/performance/odp_crypto.c similarity index 100% rename from test/common_plat/performance/odp_crypto.c rename to test/performance/odp_crypto.c diff --git a/test/common_plat/performance/odp_l2fwd.c b/test/performance/odp_l2fwd.c similarity index 100% rename from test/common_plat/performance/odp_l2fwd.c rename to test/performance/odp_l2fwd.c diff --git a/test/common_plat/performance/odp_l2fwd_run.sh b/test/performance/odp_l2fwd_run.sh similarity index 95% rename from test/common_plat/performance/odp_l2fwd_run.sh rename to test/performance/odp_l2fwd_run.sh index b3148f81f..d14b86164 100755 --- a/test/common_plat/performance/odp_l2fwd_run.sh +++ b/test/performance/odp_l2fwd_run.sh @@ -25,12 +25,12 @@ TEST_DIR="${TEST_DIR:-$PWD}" # directory where test sources are, including scripts TEST_SRC_DIR=$(dirname $0) -PATH=$TEST_DIR:$TEST_DIR/../../../example/generator:$PATH +PATH=$TEST_DIR:$TEST_DIR/../../example/generator:$PATH # exit codes expected by automake for skipped tests TEST_SKIPPED=77 -PLATFORM_VALIDATION=${TEST_SRC_DIR}/../../../platform/$ODP_PLATFORM/test/validation +PLATFORM_VALIDATION=${TEST_SRC_DIR}/../../platform/$ODP_PLATFORM/test/validation FLOOD_MODE=0 diff --git a/test/common_plat/performance/odp_pktio_ordered.c b/test/performance/odp_pktio_ordered.c similarity index 100% rename from test/common_plat/performance/odp_pktio_ordered.c rename to test/performance/odp_pktio_ordered.c diff --git a/test/common_plat/performance/odp_pktio_ordered_run.sh b/test/performance/odp_pktio_ordered_run.sh similarity index 100% rename from test/common_plat/performance/odp_pktio_ordered_run.sh rename to test/performance/odp_pktio_ordered_run.sh diff --git a/test/common_plat/performance/odp_pktio_perf.c b/test/performance/odp_pktio_perf.c similarity index 100% rename from test/common_plat/performance/odp_pktio_perf.c rename to test/performance/odp_pktio_perf.c diff --git a/test/common_plat/performance/odp_sched_latency.c b/test/performance/odp_sched_latency.c similarity index 100% rename from test/common_plat/performance/odp_sched_latency.c rename to test/performance/odp_sched_latency.c diff --git a/test/common_plat/performance/odp_sched_latency_run.sh b/test/performance/odp_sched_latency_run.sh similarity index 100% rename from test/common_plat/performance/odp_sched_latency_run.sh rename to test/performance/odp_sched_latency_run.sh diff --git a/test/common_plat/performance/odp_scheduling.c b/test/performance/odp_scheduling.c similarity index 100% rename from test/common_plat/performance/odp_scheduling.c rename to test/performance/odp_scheduling.c diff --git a/test/common_plat/performance/odp_scheduling_run.sh b/test/performance/odp_scheduling_run.sh similarity index 100% rename from test/common_plat/performance/odp_scheduling_run.sh rename to test/performance/odp_scheduling_run.sh diff --git a/test/common_plat/performance/udp64.pcap b/test/performance/udp64.pcap similarity index 100% rename from test/common_plat/performance/udp64.pcap rename to test/performance/udp64.pcap diff --git a/test/common_plat/validation/Makefile.am b/test/validation/Makefile.am similarity index 100% rename from test/common_plat/validation/Makefile.am rename to test/validation/Makefile.am diff --git a/test/common_plat/validation/api/.gitignore b/test/validation/api/.gitignore similarity index 100% rename from test/common_plat/validation/api/.gitignore rename to test/validation/api/.gitignore diff --git a/test/common_plat/validation/api/Makefile.am b/test/validation/api/Makefile.am similarity index 95% rename from test/common_plat/validation/api/Makefile.am rename to test/validation/api/Makefile.am index e891c94cb..730a336d5 100644 --- a/test/common_plat/validation/api/Makefile.am +++ b/test/validation/api/Makefile.am @@ -25,7 +25,7 @@ ODP_MODULES = atomic \ SUBDIRS = $(ODP_MODULES) include $(top_srcdir)/test/Makefile.inc -TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/common_plat/validation +TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/validation TESTS = \ atomic/atomic_main$(EXEEXT) \ diff --git a/test/common_plat/validation/api/Makefile.inc b/test/validation/api/Makefile.inc similarity index 100% rename from test/common_plat/validation/api/Makefile.inc rename to test/validation/api/Makefile.inc diff --git a/test/common_plat/validation/api/README b/test/validation/api/README similarity index 100% rename from test/common_plat/validation/api/README rename to test/validation/api/README diff --git a/test/common_plat/validation/api/atomic/.gitignore b/test/validation/api/atomic/.gitignore similarity index 100% rename from test/common_plat/validation/api/atomic/.gitignore rename to test/validation/api/atomic/.gitignore diff --git a/test/common_plat/validation/api/atomic/Makefile.am b/test/validation/api/atomic/Makefile.am similarity index 100% rename from test/common_plat/validation/api/atomic/Makefile.am rename to test/validation/api/atomic/Makefile.am diff --git a/test/common_plat/validation/api/atomic/atomic.c b/test/validation/api/atomic/atomic.c similarity index 100% rename from test/common_plat/validation/api/atomic/atomic.c rename to test/validation/api/atomic/atomic.c diff --git a/test/common_plat/validation/api/atomic/atomic.h b/test/validation/api/atomic/atomic.h similarity index 100% rename from test/common_plat/validation/api/atomic/atomic.h rename to test/validation/api/atomic/atomic.h diff --git a/test/common_plat/validation/api/atomic/atomic_main.c b/test/validation/api/atomic/atomic_main.c similarity index 100% rename from test/common_plat/validation/api/atomic/atomic_main.c rename to test/validation/api/atomic/atomic_main.c diff --git a/test/common_plat/validation/api/barrier/.gitignore b/test/validation/api/barrier/.gitignore similarity index 100% rename from test/common_plat/validation/api/barrier/.gitignore rename to test/validation/api/barrier/.gitignore diff --git a/test/common_plat/validation/api/barrier/Makefile.am b/test/validation/api/barrier/Makefile.am similarity index 100% rename from test/common_plat/validation/api/barrier/Makefile.am rename to test/validation/api/barrier/Makefile.am diff --git a/test/common_plat/validation/api/barrier/barrier.c b/test/validation/api/barrier/barrier.c similarity index 100% rename from test/common_plat/validation/api/barrier/barrier.c rename to test/validation/api/barrier/barrier.c diff --git a/test/common_plat/validation/api/barrier/barrier.h b/test/validation/api/barrier/barrier.h similarity index 100% rename from test/common_plat/validation/api/barrier/barrier.h rename to test/validation/api/barrier/barrier.h diff --git a/test/common_plat/validation/api/barrier/barrier_main.c b/test/validation/api/barrier/barrier_main.c similarity index 100% rename from test/common_plat/validation/api/barrier/barrier_main.c rename to test/validation/api/barrier/barrier_main.c diff --git a/test/common_plat/validation/api/buffer/.gitignore b/test/validation/api/buffer/.gitignore similarity index 100% rename from test/common_plat/validation/api/buffer/.gitignore rename to test/validation/api/buffer/.gitignore diff --git a/test/common_plat/validation/api/buffer/Makefile.am b/test/validation/api/buffer/Makefile.am similarity index 100% rename from test/common_plat/validation/api/buffer/Makefile.am rename to test/validation/api/buffer/Makefile.am diff --git a/test/common_plat/validation/api/buffer/buffer.c b/test/validation/api/buffer/buffer.c similarity index 100% rename from test/common_plat/validation/api/buffer/buffer.c rename to test/validation/api/buffer/buffer.c diff --git a/test/common_plat/validation/api/buffer/buffer.h b/test/validation/api/buffer/buffer.h similarity index 100% rename from test/common_plat/validation/api/buffer/buffer.h rename to test/validation/api/buffer/buffer.h diff --git a/test/common_plat/validation/api/buffer/buffer_main.c b/test/validation/api/buffer/buffer_main.c similarity index 100% rename from test/common_plat/validation/api/buffer/buffer_main.c rename to test/validation/api/buffer/buffer_main.c diff --git a/test/common_plat/validation/api/classification/.gitignore b/test/validation/api/classification/.gitignore similarity index 100% rename from test/common_plat/validation/api/classification/.gitignore rename to test/validation/api/classification/.gitignore diff --git a/test/common_plat/validation/api/classification/Makefile.am b/test/validation/api/classification/Makefile.am similarity index 100% rename from test/common_plat/validation/api/classification/Makefile.am rename to test/validation/api/classification/Makefile.am diff --git a/test/common_plat/validation/api/classification/classification.c b/test/validation/api/classification/classification.c similarity index 100% rename from test/common_plat/validation/api/classification/classification.c rename to test/validation/api/classification/classification.c diff --git a/test/common_plat/validation/api/classification/classification.h b/test/validation/api/classification/classification.h similarity index 100% rename from test/common_plat/validation/api/classification/classification.h rename to test/validation/api/classification/classification.h diff --git a/test/common_plat/validation/api/classification/classification_main.c b/test/validation/api/classification/classification_main.c similarity index 100% rename from test/common_plat/validation/api/classification/classification_main.c rename to test/validation/api/classification/classification_main.c diff --git a/test/common_plat/validation/api/classification/odp_classification_basic.c b/test/validation/api/classification/odp_classification_basic.c similarity index 100% rename from test/common_plat/validation/api/classification/odp_classification_basic.c rename to test/validation/api/classification/odp_classification_basic.c diff --git a/test/common_plat/validation/api/classification/odp_classification_common.c b/test/validation/api/classification/odp_classification_common.c similarity index 100% rename from test/common_plat/validation/api/classification/odp_classification_common.c rename to test/validation/api/classification/odp_classification_common.c diff --git a/test/common_plat/validation/api/classification/odp_classification_test_pmr.c b/test/validation/api/classification/odp_classification_test_pmr.c similarity index 100% rename from test/common_plat/validation/api/classification/odp_classification_test_pmr.c rename to test/validation/api/classification/odp_classification_test_pmr.c diff --git a/test/common_plat/validation/api/classification/odp_classification_tests.c b/test/validation/api/classification/odp_classification_tests.c similarity index 100% rename from test/common_plat/validation/api/classification/odp_classification_tests.c rename to test/validation/api/classification/odp_classification_tests.c diff --git a/test/common_plat/validation/api/classification/odp_classification_testsuites.h b/test/validation/api/classification/odp_classification_testsuites.h similarity index 100% rename from test/common_plat/validation/api/classification/odp_classification_testsuites.h rename to test/validation/api/classification/odp_classification_testsuites.h diff --git a/test/common_plat/validation/api/cpumask/.gitignore b/test/validation/api/cpumask/.gitignore similarity index 100% rename from test/common_plat/validation/api/cpumask/.gitignore rename to test/validation/api/cpumask/.gitignore diff --git a/test/common_plat/validation/api/cpumask/Makefile.am b/test/validation/api/cpumask/Makefile.am similarity index 100% rename from test/common_plat/validation/api/cpumask/Makefile.am rename to test/validation/api/cpumask/Makefile.am diff --git a/test/common_plat/validation/api/cpumask/cpumask.c b/test/validation/api/cpumask/cpumask.c similarity index 100% rename from test/common_plat/validation/api/cpumask/cpumask.c rename to test/validation/api/cpumask/cpumask.c diff --git a/test/common_plat/validation/api/cpumask/cpumask.h b/test/validation/api/cpumask/cpumask.h similarity index 100% rename from test/common_plat/validation/api/cpumask/cpumask.h rename to test/validation/api/cpumask/cpumask.h diff --git a/test/common_plat/validation/api/cpumask/cpumask_main.c b/test/validation/api/cpumask/cpumask_main.c similarity index 100% rename from test/common_plat/validation/api/cpumask/cpumask_main.c rename to test/validation/api/cpumask/cpumask_main.c diff --git a/test/common_plat/validation/api/crypto/.gitignore b/test/validation/api/crypto/.gitignore similarity index 100% rename from test/common_plat/validation/api/crypto/.gitignore rename to test/validation/api/crypto/.gitignore diff --git a/test/common_plat/validation/api/crypto/Makefile.am b/test/validation/api/crypto/Makefile.am similarity index 100% rename from test/common_plat/validation/api/crypto/Makefile.am rename to test/validation/api/crypto/Makefile.am diff --git a/test/common_plat/validation/api/crypto/crypto.c b/test/validation/api/crypto/crypto.c similarity index 100% rename from test/common_plat/validation/api/crypto/crypto.c rename to test/validation/api/crypto/crypto.c diff --git a/test/common_plat/validation/api/crypto/crypto.h b/test/validation/api/crypto/crypto.h similarity index 100% rename from test/common_plat/validation/api/crypto/crypto.h rename to test/validation/api/crypto/crypto.h diff --git a/test/common_plat/validation/api/crypto/crypto_main.c b/test/validation/api/crypto/crypto_main.c similarity index 100% rename from test/common_plat/validation/api/crypto/crypto_main.c rename to test/validation/api/crypto/crypto_main.c diff --git a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c similarity index 100% rename from test/common_plat/validation/api/crypto/odp_crypto_test_inp.c rename to test/validation/api/crypto/odp_crypto_test_inp.c diff --git a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.h b/test/validation/api/crypto/odp_crypto_test_inp.h similarity index 100% rename from test/common_plat/validation/api/crypto/odp_crypto_test_inp.h rename to test/validation/api/crypto/odp_crypto_test_inp.h diff --git a/test/common_plat/validation/api/crypto/test_vectors.h b/test/validation/api/crypto/test_vectors.h similarity index 100% rename from test/common_plat/validation/api/crypto/test_vectors.h rename to test/validation/api/crypto/test_vectors.h diff --git a/test/common_plat/validation/api/crypto/test_vectors_len.h b/test/validation/api/crypto/test_vectors_len.h similarity index 100% rename from test/common_plat/validation/api/crypto/test_vectors_len.h rename to test/validation/api/crypto/test_vectors_len.h diff --git a/test/common_plat/validation/api/errno/.gitignore b/test/validation/api/errno/.gitignore similarity index 100% rename from test/common_plat/validation/api/errno/.gitignore rename to test/validation/api/errno/.gitignore diff --git a/test/common_plat/validation/api/errno/Makefile.am b/test/validation/api/errno/Makefile.am similarity index 100% rename from test/common_plat/validation/api/errno/Makefile.am rename to test/validation/api/errno/Makefile.am diff --git a/test/common_plat/validation/api/errno/errno.c b/test/validation/api/errno/errno.c similarity index 100% rename from test/common_plat/validation/api/errno/errno.c rename to test/validation/api/errno/errno.c diff --git a/test/common_plat/validation/api/errno/errno.h b/test/validation/api/errno/errno.h similarity index 100% rename from test/common_plat/validation/api/errno/errno.h rename to test/validation/api/errno/errno.h diff --git a/test/common_plat/validation/api/errno/errno_main.c b/test/validation/api/errno/errno_main.c similarity index 100% rename from test/common_plat/validation/api/errno/errno_main.c rename to test/validation/api/errno/errno_main.c diff --git a/test/common_plat/validation/api/hash/.gitignore b/test/validation/api/hash/.gitignore similarity index 100% rename from test/common_plat/validation/api/hash/.gitignore rename to test/validation/api/hash/.gitignore diff --git a/test/common_plat/validation/api/hash/Makefile.am b/test/validation/api/hash/Makefile.am similarity index 100% rename from test/common_plat/validation/api/hash/Makefile.am rename to test/validation/api/hash/Makefile.am diff --git a/test/common_plat/validation/api/hash/hash.c b/test/validation/api/hash/hash.c similarity index 100% rename from test/common_plat/validation/api/hash/hash.c rename to test/validation/api/hash/hash.c diff --git a/test/common_plat/validation/api/hash/hash.h b/test/validation/api/hash/hash.h similarity index 100% rename from test/common_plat/validation/api/hash/hash.h rename to test/validation/api/hash/hash.h diff --git a/test/common_plat/validation/api/hash/hash_main.c b/test/validation/api/hash/hash_main.c similarity index 100% rename from test/common_plat/validation/api/hash/hash_main.c rename to test/validation/api/hash/hash_main.c diff --git a/test/common_plat/validation/api/init/.gitignore b/test/validation/api/init/.gitignore similarity index 100% rename from test/common_plat/validation/api/init/.gitignore rename to test/validation/api/init/.gitignore diff --git a/test/common_plat/validation/api/init/Makefile.am b/test/validation/api/init/Makefile.am similarity index 100% rename from test/common_plat/validation/api/init/Makefile.am rename to test/validation/api/init/Makefile.am diff --git a/test/common_plat/validation/api/init/init.c b/test/validation/api/init/init.c similarity index 100% rename from test/common_plat/validation/api/init/init.c rename to test/validation/api/init/init.c diff --git a/test/common_plat/validation/api/init/init.h b/test/validation/api/init/init.h similarity index 100% rename from test/common_plat/validation/api/init/init.h rename to test/validation/api/init/init.h diff --git a/test/common_plat/validation/api/init/init_main_abort.c b/test/validation/api/init/init_main_abort.c similarity index 100% rename from test/common_plat/validation/api/init/init_main_abort.c rename to test/validation/api/init/init_main_abort.c diff --git a/test/common_plat/validation/api/init/init_main_log.c b/test/validation/api/init/init_main_log.c similarity index 100% rename from test/common_plat/validation/api/init/init_main_log.c rename to test/validation/api/init/init_main_log.c diff --git a/test/common_plat/validation/api/init/init_main_ok.c b/test/validation/api/init/init_main_ok.c similarity index 100% rename from test/common_plat/validation/api/init/init_main_ok.c rename to test/validation/api/init/init_main_ok.c diff --git a/test/common_plat/validation/api/lock/.gitignore b/test/validation/api/lock/.gitignore similarity index 100% rename from test/common_plat/validation/api/lock/.gitignore rename to test/validation/api/lock/.gitignore diff --git a/test/common_plat/validation/api/lock/Makefile.am b/test/validation/api/lock/Makefile.am similarity index 100% rename from test/common_plat/validation/api/lock/Makefile.am rename to test/validation/api/lock/Makefile.am diff --git a/test/common_plat/validation/api/lock/lock.c b/test/validation/api/lock/lock.c similarity index 100% rename from test/common_plat/validation/api/lock/lock.c rename to test/validation/api/lock/lock.c diff --git a/test/common_plat/validation/api/lock/lock.h b/test/validation/api/lock/lock.h similarity index 100% rename from test/common_plat/validation/api/lock/lock.h rename to test/validation/api/lock/lock.h diff --git a/test/common_plat/validation/api/lock/lock_main.c b/test/validation/api/lock/lock_main.c similarity index 100% rename from test/common_plat/validation/api/lock/lock_main.c rename to test/validation/api/lock/lock_main.c diff --git a/test/common_plat/validation/api/packet/.gitignore b/test/validation/api/packet/.gitignore similarity index 100% rename from test/common_plat/validation/api/packet/.gitignore rename to test/validation/api/packet/.gitignore diff --git a/test/common_plat/validation/api/packet/Makefile.am b/test/validation/api/packet/Makefile.am similarity index 100% rename from test/common_plat/validation/api/packet/Makefile.am rename to test/validation/api/packet/Makefile.am diff --git a/test/common_plat/validation/api/packet/packet.c b/test/validation/api/packet/packet.c similarity index 100% rename from test/common_plat/validation/api/packet/packet.c rename to test/validation/api/packet/packet.c diff --git a/test/common_plat/validation/api/packet/packet.h b/test/validation/api/packet/packet.h similarity index 100% rename from test/common_plat/validation/api/packet/packet.h rename to test/validation/api/packet/packet.h diff --git a/test/common_plat/validation/api/packet/packet_main.c b/test/validation/api/packet/packet_main.c similarity index 100% rename from test/common_plat/validation/api/packet/packet_main.c rename to test/validation/api/packet/packet_main.c diff --git a/test/common_plat/validation/api/pktio/.gitignore b/test/validation/api/pktio/.gitignore similarity index 100% rename from test/common_plat/validation/api/pktio/.gitignore rename to test/validation/api/pktio/.gitignore diff --git a/test/common_plat/validation/api/pktio/Makefile.am b/test/validation/api/pktio/Makefile.am similarity index 100% rename from test/common_plat/validation/api/pktio/Makefile.am rename to test/validation/api/pktio/Makefile.am diff --git a/test/common_plat/validation/api/pktio/parser.c b/test/validation/api/pktio/parser.c similarity index 100% rename from test/common_plat/validation/api/pktio/parser.c rename to test/validation/api/pktio/parser.c diff --git a/test/common_plat/validation/api/pktio/parser.h b/test/validation/api/pktio/parser.h similarity index 100% rename from test/common_plat/validation/api/pktio/parser.h rename to test/validation/api/pktio/parser.h diff --git a/test/common_plat/validation/api/pktio/pktio.c b/test/validation/api/pktio/pktio.c similarity index 100% rename from test/common_plat/validation/api/pktio/pktio.c rename to test/validation/api/pktio/pktio.c diff --git a/test/common_plat/validation/api/pktio/pktio.h b/test/validation/api/pktio/pktio.h similarity index 100% rename from test/common_plat/validation/api/pktio/pktio.h rename to test/validation/api/pktio/pktio.h diff --git a/test/common_plat/validation/api/pktio/pktio_main.c b/test/validation/api/pktio/pktio_main.c similarity index 100% rename from test/common_plat/validation/api/pktio/pktio_main.c rename to test/validation/api/pktio/pktio_main.c diff --git a/test/common_plat/validation/api/pool/.gitignore b/test/validation/api/pool/.gitignore similarity index 100% rename from test/common_plat/validation/api/pool/.gitignore rename to test/validation/api/pool/.gitignore diff --git a/test/common_plat/validation/api/pool/Makefile.am b/test/validation/api/pool/Makefile.am similarity index 100% rename from test/common_plat/validation/api/pool/Makefile.am rename to test/validation/api/pool/Makefile.am diff --git a/test/common_plat/validation/api/pool/pool.c b/test/validation/api/pool/pool.c similarity index 100% rename from test/common_plat/validation/api/pool/pool.c rename to test/validation/api/pool/pool.c diff --git a/test/common_plat/validation/api/pool/pool.h b/test/validation/api/pool/pool.h similarity index 100% rename from test/common_plat/validation/api/pool/pool.h rename to test/validation/api/pool/pool.h diff --git a/test/common_plat/validation/api/pool/pool_main.c b/test/validation/api/pool/pool_main.c similarity index 100% rename from test/common_plat/validation/api/pool/pool_main.c rename to test/validation/api/pool/pool_main.c diff --git a/test/common_plat/validation/api/queue/.gitignore b/test/validation/api/queue/.gitignore similarity index 100% rename from test/common_plat/validation/api/queue/.gitignore rename to test/validation/api/queue/.gitignore diff --git a/test/common_plat/validation/api/queue/Makefile.am b/test/validation/api/queue/Makefile.am similarity index 100% rename from test/common_plat/validation/api/queue/Makefile.am rename to test/validation/api/queue/Makefile.am diff --git a/test/common_plat/validation/api/queue/queue.c b/test/validation/api/queue/queue.c similarity index 100% rename from test/common_plat/validation/api/queue/queue.c rename to test/validation/api/queue/queue.c diff --git a/test/common_plat/validation/api/queue/queue.h b/test/validation/api/queue/queue.h similarity index 100% rename from test/common_plat/validation/api/queue/queue.h rename to test/validation/api/queue/queue.h diff --git a/test/common_plat/validation/api/queue/queue_main.c b/test/validation/api/queue/queue_main.c similarity index 100% rename from test/common_plat/validation/api/queue/queue_main.c rename to test/validation/api/queue/queue_main.c diff --git a/test/common_plat/validation/api/random/.gitignore b/test/validation/api/random/.gitignore similarity index 100% rename from test/common_plat/validation/api/random/.gitignore rename to test/validation/api/random/.gitignore diff --git a/test/common_plat/validation/api/random/Makefile.am b/test/validation/api/random/Makefile.am similarity index 100% rename from test/common_plat/validation/api/random/Makefile.am rename to test/validation/api/random/Makefile.am diff --git a/test/common_plat/validation/api/random/random.c b/test/validation/api/random/random.c similarity index 100% rename from test/common_plat/validation/api/random/random.c rename to test/validation/api/random/random.c diff --git a/test/common_plat/validation/api/random/random.h b/test/validation/api/random/random.h similarity index 100% rename from test/common_plat/validation/api/random/random.h rename to test/validation/api/random/random.h diff --git a/test/common_plat/validation/api/random/random_main.c b/test/validation/api/random/random_main.c similarity index 100% rename from test/common_plat/validation/api/random/random_main.c rename to test/validation/api/random/random_main.c diff --git a/test/common_plat/validation/api/scheduler/.gitignore b/test/validation/api/scheduler/.gitignore similarity index 100% rename from test/common_plat/validation/api/scheduler/.gitignore rename to test/validation/api/scheduler/.gitignore diff --git a/test/common_plat/validation/api/scheduler/Makefile.am b/test/validation/api/scheduler/Makefile.am similarity index 100% rename from test/common_plat/validation/api/scheduler/Makefile.am rename to test/validation/api/scheduler/Makefile.am diff --git a/test/common_plat/validation/api/scheduler/scheduler.c b/test/validation/api/scheduler/scheduler.c similarity index 100% rename from test/common_plat/validation/api/scheduler/scheduler.c rename to test/validation/api/scheduler/scheduler.c diff --git a/test/common_plat/validation/api/scheduler/scheduler.h b/test/validation/api/scheduler/scheduler.h similarity index 100% rename from test/common_plat/validation/api/scheduler/scheduler.h rename to test/validation/api/scheduler/scheduler.h diff --git a/test/common_plat/validation/api/scheduler/scheduler_main.c b/test/validation/api/scheduler/scheduler_main.c similarity index 100% rename from test/common_plat/validation/api/scheduler/scheduler_main.c rename to test/validation/api/scheduler/scheduler_main.c diff --git a/test/common_plat/validation/api/shmem/.gitignore b/test/validation/api/shmem/.gitignore similarity index 100% rename from test/common_plat/validation/api/shmem/.gitignore rename to test/validation/api/shmem/.gitignore diff --git a/test/common_plat/validation/api/shmem/Makefile.am b/test/validation/api/shmem/Makefile.am similarity index 100% rename from test/common_plat/validation/api/shmem/Makefile.am rename to test/validation/api/shmem/Makefile.am diff --git a/test/common_plat/validation/api/shmem/shmem.c b/test/validation/api/shmem/shmem.c similarity index 100% rename from test/common_plat/validation/api/shmem/shmem.c rename to test/validation/api/shmem/shmem.c diff --git a/test/common_plat/validation/api/shmem/shmem.h b/test/validation/api/shmem/shmem.h similarity index 100% rename from test/common_plat/validation/api/shmem/shmem.h rename to test/validation/api/shmem/shmem.h diff --git a/test/common_plat/validation/api/shmem/shmem_main.c b/test/validation/api/shmem/shmem_main.c similarity index 100% rename from test/common_plat/validation/api/shmem/shmem_main.c rename to test/validation/api/shmem/shmem_main.c diff --git a/test/common_plat/validation/api/std_clib/.gitignore b/test/validation/api/std_clib/.gitignore similarity index 100% rename from test/common_plat/validation/api/std_clib/.gitignore rename to test/validation/api/std_clib/.gitignore diff --git a/test/common_plat/validation/api/std_clib/Makefile.am b/test/validation/api/std_clib/Makefile.am similarity index 100% rename from test/common_plat/validation/api/std_clib/Makefile.am rename to test/validation/api/std_clib/Makefile.am diff --git a/test/common_plat/validation/api/std_clib/std_clib.c b/test/validation/api/std_clib/std_clib.c similarity index 100% rename from test/common_plat/validation/api/std_clib/std_clib.c rename to test/validation/api/std_clib/std_clib.c diff --git a/test/common_plat/validation/api/std_clib/std_clib.h b/test/validation/api/std_clib/std_clib.h similarity index 100% rename from test/common_plat/validation/api/std_clib/std_clib.h rename to test/validation/api/std_clib/std_clib.h diff --git a/test/common_plat/validation/api/std_clib/std_clib_main.c b/test/validation/api/std_clib/std_clib_main.c similarity index 100% rename from test/common_plat/validation/api/std_clib/std_clib_main.c rename to test/validation/api/std_clib/std_clib_main.c diff --git a/test/common_plat/validation/api/system/.gitignore b/test/validation/api/system/.gitignore similarity index 100% rename from test/common_plat/validation/api/system/.gitignore rename to test/validation/api/system/.gitignore diff --git a/test/common_plat/validation/api/system/Makefile.am b/test/validation/api/system/Makefile.am similarity index 100% rename from test/common_plat/validation/api/system/Makefile.am rename to test/validation/api/system/Makefile.am diff --git a/test/common_plat/validation/api/system/system.c b/test/validation/api/system/system.c similarity index 100% rename from test/common_plat/validation/api/system/system.c rename to test/validation/api/system/system.c diff --git a/test/common_plat/validation/api/system/system.h b/test/validation/api/system/system.h similarity index 100% rename from test/common_plat/validation/api/system/system.h rename to test/validation/api/system/system.h diff --git a/test/common_plat/validation/api/system/system_main.c b/test/validation/api/system/system_main.c similarity index 100% rename from test/common_plat/validation/api/system/system_main.c rename to test/validation/api/system/system_main.c diff --git a/test/common_plat/validation/api/thread/.gitignore b/test/validation/api/thread/.gitignore similarity index 100% rename from test/common_plat/validation/api/thread/.gitignore rename to test/validation/api/thread/.gitignore diff --git a/test/common_plat/validation/api/thread/Makefile.am b/test/validation/api/thread/Makefile.am similarity index 100% rename from test/common_plat/validation/api/thread/Makefile.am rename to test/validation/api/thread/Makefile.am diff --git a/test/common_plat/validation/api/thread/thread.c b/test/validation/api/thread/thread.c similarity index 100% rename from test/common_plat/validation/api/thread/thread.c rename to test/validation/api/thread/thread.c diff --git a/test/common_plat/validation/api/thread/thread.h b/test/validation/api/thread/thread.h similarity index 100% rename from test/common_plat/validation/api/thread/thread.h rename to test/validation/api/thread/thread.h diff --git a/test/common_plat/validation/api/thread/thread_main.c b/test/validation/api/thread/thread_main.c similarity index 100% rename from test/common_plat/validation/api/thread/thread_main.c rename to test/validation/api/thread/thread_main.c diff --git a/test/common_plat/validation/api/time/.gitignore b/test/validation/api/time/.gitignore similarity index 100% rename from test/common_plat/validation/api/time/.gitignore rename to test/validation/api/time/.gitignore diff --git a/test/common_plat/validation/api/time/Makefile.am b/test/validation/api/time/Makefile.am similarity index 100% rename from test/common_plat/validation/api/time/Makefile.am rename to test/validation/api/time/Makefile.am diff --git a/test/common_plat/validation/api/time/time.c b/test/validation/api/time/time.c similarity index 100% rename from test/common_plat/validation/api/time/time.c rename to test/validation/api/time/time.c diff --git a/test/common_plat/validation/api/time/time.sh b/test/validation/api/time/time.sh similarity index 93% rename from test/common_plat/validation/api/time/time.sh rename to test/validation/api/time/time.sh index 02bf75a76..ecedddb76 100755 --- a/test/common_plat/validation/api/time/time.sh +++ b/test/validation/api/time/time.sh @@ -13,7 +13,7 @@ # -in the current directory. # running stand alone out of tree requires setting PATH PATH=${TEST_DIR}/api/time:$PATH -PATH=$(dirname $0)/../../../../common_plat/validation/api/time:$PATH +PATH=$(dirname $0)/../../../../validation/api/time:$PATH PATH=$(dirname $0):$PATH PATH=`pwd`:$PATH diff --git a/test/common_plat/validation/api/time/time_main.c b/test/validation/api/time/time_main.c similarity index 100% rename from test/common_plat/validation/api/time/time_main.c rename to test/validation/api/time/time_main.c diff --git a/test/common_plat/validation/api/time/time_test.h b/test/validation/api/time/time_test.h similarity index 100% rename from test/common_plat/validation/api/time/time_test.h rename to test/validation/api/time/time_test.h diff --git a/test/common_plat/validation/api/timer/.gitignore b/test/validation/api/timer/.gitignore similarity index 100% rename from test/common_plat/validation/api/timer/.gitignore rename to test/validation/api/timer/.gitignore diff --git a/test/common_plat/validation/api/timer/Makefile.am b/test/validation/api/timer/Makefile.am similarity index 100% rename from test/common_plat/validation/api/timer/Makefile.am rename to test/validation/api/timer/Makefile.am diff --git a/test/common_plat/validation/api/timer/timer.c b/test/validation/api/timer/timer.c similarity index 100% rename from test/common_plat/validation/api/timer/timer.c rename to test/validation/api/timer/timer.c diff --git a/test/common_plat/validation/api/timer/timer.h b/test/validation/api/timer/timer.h similarity index 100% rename from test/common_plat/validation/api/timer/timer.h rename to test/validation/api/timer/timer.h diff --git a/test/common_plat/validation/api/timer/timer_main.c b/test/validation/api/timer/timer_main.c similarity index 100% rename from test/common_plat/validation/api/timer/timer_main.c rename to test/validation/api/timer/timer_main.c diff --git a/test/common_plat/validation/api/traffic_mngr/.gitignore b/test/validation/api/traffic_mngr/.gitignore similarity index 100% rename from test/common_plat/validation/api/traffic_mngr/.gitignore rename to test/validation/api/traffic_mngr/.gitignore diff --git a/test/common_plat/validation/api/traffic_mngr/Makefile.am b/test/validation/api/traffic_mngr/Makefile.am similarity index 100% rename from test/common_plat/validation/api/traffic_mngr/Makefile.am rename to test/validation/api/traffic_mngr/Makefile.am diff --git a/test/common_plat/validation/api/traffic_mngr/traffic_mngr.c b/test/validation/api/traffic_mngr/traffic_mngr.c similarity index 100% rename from test/common_plat/validation/api/traffic_mngr/traffic_mngr.c rename to test/validation/api/traffic_mngr/traffic_mngr.c diff --git a/test/common_plat/validation/api/traffic_mngr/traffic_mngr.h b/test/validation/api/traffic_mngr/traffic_mngr.h similarity index 100% rename from test/common_plat/validation/api/traffic_mngr/traffic_mngr.h rename to test/validation/api/traffic_mngr/traffic_mngr.h diff --git a/test/common_plat/validation/api/traffic_mngr/traffic_mngr.sh b/test/validation/api/traffic_mngr/traffic_mngr.sh similarity index 93% rename from test/common_plat/validation/api/traffic_mngr/traffic_mngr.sh rename to test/validation/api/traffic_mngr/traffic_mngr.sh index 4db7ea384..c4e2d2976 100755 --- a/test/common_plat/validation/api/traffic_mngr/traffic_mngr.sh +++ b/test/validation/api/traffic_mngr/traffic_mngr.sh @@ -13,7 +13,7 @@ # -in the current directory. # running stand alone out of tree requires setting PATH PATH=${TEST_DIR}/api/traffic_mngr:$PATH -PATH=$(dirname $0)/../../../../common_plat/validation/api/traffic_mngr:$PATH +PATH=$(dirname $0)/../../../../validation/api/traffic_mngr:$PATH PATH=$(dirname $0):$PATH PATH=`pwd`:$PATH diff --git a/test/common_plat/validation/api/traffic_mngr/traffic_mngr_main.c b/test/validation/api/traffic_mngr/traffic_mngr_main.c similarity index 100% rename from test/common_plat/validation/api/traffic_mngr/traffic_mngr_main.c rename to test/validation/api/traffic_mngr/traffic_mngr_main.c