test: drop now-unused common_plat directory

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.ereminsolenikov@linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer@linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>

177 files changed, 51 insertions, 55 deletions

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/Makefile.inc b/platform/linux-generic/test/Makefile.inc
index cfb614419..dd21917eb 100644
--- a/platform/linux-generic/test/Makefile.inc
+++ b/platform/linux-generic/test/Makefile.inc
@@ -6,11 +6,11 @@ AM_LDFLAGS = -static
 
 AM_CFLAGS = $(CUNIT_CFLAGS)
 
-LIBCUNIT_COMMON = $(top_builddir)/test/common_plat/common/libcunit_common.la
+LIBCUNIT_COMMON = $(top_builddir)/test/common/libcunit_common.la
 LIB   = $(top_builddir)/lib
 LIBODP = $(LIB)/libodphelper.la $(LIB)/libodp-linux.la $(DPDK_PMDS)
 
-INCCUNIT_COMMON = -I$(top_srcdir)/test/common_plat/common
+INCCUNIT_COMMON = -I$(top_srcdir)/test/common
 INCODP =  \
 	 -I$(top_builddir)/include \
 	 -I$(top_builddir)/platform/@with_platform@/include \
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..8fbd91907 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1 +1 @@
-SUBDIRS = common_plat
+SUBDIRS = common performance miscellaneous validation
diff --git a/test/Makefile.inc b/test/Makefile.inc
index 403573a70..aa20ba269 100644
--- a/test/Makefile.inc
+++ b/test/Makefile.inc
@@ -12,7 +12,7 @@ INCFLAGS = \
 	-I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ \
 	-I$(top_srcdir)/platform/@with_platform@/include \
 	-I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ \
-	-I$(top_srcdir)/test/common_plat/common \
+	-I$(top_srcdir)/test/common \
 	-I$(top_builddir)/include
 
 AM_CPPFLAGS = $(INCFLAGS)
diff --git a/test/README b/test/README
index f4886d35b..fa00394e0 100644
--- a/test/README
+++ b/test/README
@@ -3,7 +3,7 @@ All rights reserved.
 
 SPDX-License-Identifier:        BSD-3-Clause
 
-Files in test/common_plat/validation directory are intended to be terse
+Files in test/validation directory are intended to be terse
 checks that help ensure that the ODP implementations all perform identically
 and to specification. Tests inside the validation directory shall be platform
 independent.
diff --git a/test/common_plat/common/Makefile.am b/test/common/Makefile.am
index a3419e0f5..a3419e0f5 100644
--- a/test/common_plat/common/Makefile.am
+++ b/test/common/Makefile.am
diff --git a/test/common_plat/common/mask_common.c b/test/common/mask_common.c
index 5f872f3e9..5f872f3e9 100644
--- a/test/common_plat/common/mask_common.c
+++ b/test/common/mask_common.c
diff --git a/test/common_plat/common/mask_common.h b/test/common/mask_common.h
index e7a38a7c7..e7a38a7c7 100644
--- a/test/common_plat/common/mask_common.h
+++ b/test/common/mask_common.h
diff --git a/test/common_plat/common/odp_cunit_common.c b/test/common/odp_cunit_common.c
index 08bf1f264..08bf1f264 100644
--- a/test/common_plat/common/odp_cunit_common.c
+++ b/test/common/odp_cunit_common.c
diff --git a/test/common_plat/common/odp_cunit_common.h b/test/common/odp_cunit_common.h
index 486a5ec51..486a5ec51 100644
--- a/test/common_plat/common/odp_cunit_common.h
+++ b/test/common/odp_cunit_common.h
diff --git a/test/common_plat/common/run-test.sh b/test/common/run-test.sh
index 2bff651cc..2bff651cc 100755
--- a/test/common_plat/common/run-test.sh
+++ b/test/common/run-test.sh
diff --git a/test/common_plat/common/test_debug.h b/test/common/test_debug.h
index aec0977d1..aec0977d1 100644
--- a/test/common_plat/common/test_debug.h
+++ b/test/common/test_debug.h
diff --git a/test/common_plat/Makefile.am b/test/common_plat/Makefile.am
deleted file mode 100644
index 8fbd91907..000000000
--- a/test/common_plat/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = common performance miscellaneous validation
diff --git a/test/common_plat/m4/configure.m4 b/test/common_plat/m4/configure.m4
deleted file mode 100644
index be878bd7d..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_plat/Makefile
-		 test/common_plat/common/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..44c6bfe9c 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/Makefile
+		 test/common/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
index dac236a67..dac236a67 100644
--- a/test/common_plat/m4/miscellaneous.m4
+++ b/test/m4/miscellaneous.m4
diff --git a/test/common_plat/m4/performance.m4 b/test/m4/performance.m4
index 34270e8d8..34270e8d8 100644
--- a/test/common_plat/m4/performance.m4
+++ b/test/m4/performance.m4
diff --git a/test/common_plat/m4/validation.m4 b/test/m4/validation.m4
index 65ba2aa2e..65ba2aa2e 100644
--- a/test/common_plat/m4/validation.m4
+++ b/test/m4/validation.m4
diff --git a/test/common_plat/miscellaneous/.gitignore b/test/miscellaneous/.gitignore
index 6e555c58e..6e555c58e 100644
--- a/test/common_plat/miscellaneous/.gitignore
+++ b/test/miscellaneous/.gitignore
diff --git a/test/common_plat/miscellaneous/Makefile.am b/test/miscellaneous/Makefile.am
index 7d42b07e1..7d42b07e1 100644
--- a/test/common_plat/miscellaneous/Makefile.am
+++ b/test/miscellaneous/Makefile.am
diff --git a/test/common_plat/miscellaneous/odp_api_from_cpp.cpp b/test/miscellaneous/odp_api_from_cpp.cpp
index 4578ae4be..4578ae4be 100644
--- a/test/common_plat/miscellaneous/odp_api_from_cpp.cpp
+++ b/test/miscellaneous/odp_api_from_cpp.cpp
diff --git a/test/common_plat/performance/.gitignore b/test/performance/.gitignore
index 72035e002..72035e002 100644
--- a/test/common_plat/performance/.gitignore
+++ b/test/performance/.gitignore
diff --git a/test/common_plat/performance/Makefile.am b/test/performance/Makefile.am
index 8d9fd3593..8d9fd3593 100644
--- a/test/common_plat/performance/Makefile.am
+++ b/test/performance/Makefile.am
diff --git a/test/common_plat/performance/dummy_crc.h b/test/performance/dummy_crc.h
index 38da44455..38da44455 100644
--- a/test/common_plat/performance/dummy_crc.h
+++ b/test/performance/dummy_crc.h
diff --git a/test/common_plat/performance/odp_bench_packet.c b/test/performance/odp_bench_packet.c
index 622245ffb..622245ffb 100644
--- a/test/common_plat/performance/odp_bench_packet.c
+++ b/test/performance/odp_bench_packet.c
diff --git a/test/common_plat/performance/odp_crypto.c b/test/performance/odp_crypto.c
index a65e4449e..a65e4449e 100644
--- a/test/common_plat/performance/odp_crypto.c
+++ b/test/performance/odp_crypto.c
diff --git a/test/common_plat/performance/odp_l2fwd.c b/test/performance/odp_l2fwd.c
index 8bd03d254..8bd03d254 100644
--- a/test/common_plat/performance/odp_l2fwd.c
+++ b/test/performance/odp_l2fwd.c
diff --git a/test/common_plat/performance/odp_l2fwd_run.sh b/test/performance/odp_l2fwd_run.sh
index f9f25ab38..3bb00e322 100755
--- a/test/common_plat/performance/odp_l2fwd_run.sh
+++ b/test/performance/odp_l2fwd_run.sh
@@ -25,13 +25,13 @@ 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
 
 VALIDATION_TESTDIR=platform/$ODP_PLATFORM/test/validation
-PLATFORM_VALIDATION=${TEST_SRC_DIR}/../../../$VALIDATION_TESTDIR
+PLATFORM_VALIDATION=${TEST_SRC_DIR}/../../$VALIDATION_TESTDIR
 
 FLOOD_MODE=0
 
diff --git a/test/common_plat/performance/odp_pktio_ordered.c b/test/performance/odp_pktio_ordered.c
index d7e43c4bc..d7e43c4bc 100644
--- a/test/common_plat/performance/odp_pktio_ordered.c
+++ b/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
index d6c2be526..d6c2be526 100755
--- a/test/common_plat/performance/odp_pktio_ordered_run.sh
+++ b/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
index a4599de62..a4599de62 100644
--- a/test/common_plat/performance/odp_pktio_perf.c
+++ b/test/performance/odp_pktio_perf.c
diff --git a/test/common_plat/performance/odp_sched_latency.c b/test/performance/odp_sched_latency.c
index fc2860518..fc2860518 100644
--- a/test/common_plat/performance/odp_sched_latency.c
+++ b/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
index 6048f5816..6048f5816 100755
--- a/test/common_plat/performance/odp_sched_latency_run.sh
+++ b/test/performance/odp_sched_latency_run.sh
diff --git a/test/common_plat/performance/odp_scheduling.c b/test/performance/odp_scheduling.c
index 03078a5b3..03078a5b3 100644
--- a/test/common_plat/performance/odp_scheduling.c
+++ b/test/performance/odp_scheduling.c
diff --git a/test/common_plat/performance/odp_scheduling_run.sh b/test/performance/odp_scheduling_run.sh
index a22326d4e..a22326d4e 100755
--- a/test/common_plat/performance/odp_scheduling_run.sh
+++ b/test/performance/odp_scheduling_run.sh
diff --git a/test/common_plat/performance/udp64.pcap b/test/performance/udp64.pcap
index 45f9d6e63..45f9d6e63 100644
--- a/test/common_plat/performance/udp64.pcap
+++ b/test/performance/udp64.pcap
diff --git a/test/common_plat/validation/Makefile.am b/test/validation/Makefile.am
index 328543780..328543780 100644
--- a/test/common_plat/validation/Makefile.am
+++ b/test/validation/Makefile.am
diff --git a/test/common_plat/validation/api/.gitignore b/test/validation/api/.gitignore
index 7e563b8b3..7e563b8b3 100644
--- a/test/common_plat/validation/api/.gitignore
+++ b/test/validation/api/.gitignore
diff --git a/test/common_plat/validation/api/Makefile.am b/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
index c4e80eb72..4af010002 100644
--- a/test/common_plat/validation/api/Makefile.inc
+++ b/test/validation/api/Makefile.inc
@@ -1,8 +1,8 @@
 include $(top_srcdir)/test/Makefile.inc
 
-COMMON_DIR = $(top_builddir)/test/common_plat/common
+COMMON_DIR = $(top_builddir)/test/common
 
-AM_CFLAGS += -I$(top_srcdir)/test/common_plat/common
+AM_CFLAGS += -I$(top_srcdir)/test/common
 AM_LDFLAGS += $(DPDK_PMDS)
 
 AM_CFLAGS += $(CUNIT_CFLAGS)
diff --git a/test/common_plat/validation/api/README b/test/validation/api/README
index 1baebaafc..1baebaafc 100644
--- a/test/common_plat/validation/api/README
+++ b/test/validation/api/README
diff --git a/test/common_plat/validation/api/atomic/.gitignore b/test/validation/api/atomic/.gitignore
index 610ffeab0..610ffeab0 100644
--- a/test/common_plat/validation/api/atomic/.gitignore
+++ b/test/validation/api/atomic/.gitignore
diff --git a/test/common_plat/validation/api/atomic/Makefile.am b/test/validation/api/atomic/Makefile.am
index b09d3b88c..b09d3b88c 100644
--- a/test/common_plat/validation/api/atomic/Makefile.am
+++ b/test/validation/api/atomic/Makefile.am
diff --git a/test/common_plat/validation/api/atomic/atomic.c b/test/validation/api/atomic/atomic.c
index 5bf2fe87a..5bf2fe87a 100644
--- a/test/common_plat/validation/api/atomic/atomic.c
+++ b/test/validation/api/atomic/atomic.c
diff --git a/test/common_plat/validation/api/atomic/atomic.h b/test/validation/api/atomic/atomic.h
index 66796c8e3..66796c8e3 100644
--- a/test/common_plat/validation/api/atomic/atomic.h
+++ b/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
index b60283931..b60283931 100644
--- a/test/common_plat/validation/api/atomic/atomic_main.c
+++ b/test/validation/api/atomic/atomic_main.c
diff --git a/test/common_plat/validation/api/barrier/.gitignore b/test/validation/api/barrier/.gitignore
index 2e0ee7ade..2e0ee7ade 100644
--- a/test/common_plat/validation/api/barrier/.gitignore
+++ b/test/validation/api/barrier/.gitignore
diff --git a/test/common_plat/validation/api/barrier/Makefile.am b/test/validation/api/barrier/Makefile.am
index 4dfb1d1ec..4dfb1d1ec 100644
--- a/test/common_plat/validation/api/barrier/Makefile.am
+++ b/test/validation/api/barrier/Makefile.am
diff --git a/test/common_plat/validation/api/barrier/barrier.c b/test/validation/api/barrier/barrier.c
index b75d6204a..b75d6204a 100644
--- a/test/common_plat/validation/api/barrier/barrier.c
+++ b/test/validation/api/barrier/barrier.c
diff --git a/test/common_plat/validation/api/barrier/barrier.h b/test/validation/api/barrier/barrier.h
index 188bcb8fa..188bcb8fa 100644
--- a/test/common_plat/validation/api/barrier/barrier.h
+++ b/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
index 28df6afa6..28df6afa6 100644
--- a/test/common_plat/validation/api/barrier/barrier_main.c
+++ b/test/validation/api/barrier/barrier_main.c
diff --git a/test/common_plat/validation/api/buffer/.gitignore b/test/validation/api/buffer/.gitignore
index 0e8ac15c1..0e8ac15c1 100644
--- a/test/common_plat/validation/api/buffer/.gitignore
+++ b/test/validation/api/buffer/.gitignore
diff --git a/test/common_plat/validation/api/buffer/Makefile.am b/test/validation/api/buffer/Makefile.am
index ae6ce0a40..ae6ce0a40 100644
--- a/test/common_plat/validation/api/buffer/Makefile.am
+++ b/test/validation/api/buffer/Makefile.am
diff --git a/test/common_plat/validation/api/buffer/buffer.c b/test/validation/api/buffer/buffer.c
index bcc09d48e..bcc09d48e 100644
--- a/test/common_plat/validation/api/buffer/buffer.c
+++ b/test/validation/api/buffer/buffer.c
diff --git a/test/common_plat/validation/api/buffer/buffer.h b/test/validation/api/buffer/buffer.h
index 48331e3f1..48331e3f1 100644
--- a/test/common_plat/validation/api/buffer/buffer.h
+++ b/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
index 8642560d3..8642560d3 100644
--- a/test/common_plat/validation/api/buffer/buffer_main.c
+++ b/test/validation/api/buffer/buffer_main.c
diff --git a/test/common_plat/validation/api/classification/.gitignore b/test/validation/api/classification/.gitignore
index e2cdfefe1..e2cdfefe1 100644
--- a/test/common_plat/validation/api/classification/.gitignore
+++ b/test/validation/api/classification/.gitignore
diff --git a/test/common_plat/validation/api/classification/Makefile.am b/test/validation/api/classification/Makefile.am
index f177528e0..f177528e0 100644
--- a/test/common_plat/validation/api/classification/Makefile.am
+++ b/test/validation/api/classification/Makefile.am
diff --git a/test/common_plat/validation/api/classification/classification.c b/test/validation/api/classification/classification.c
index a0d290ec5..a0d290ec5 100644
--- a/test/common_plat/validation/api/classification/classification.c
+++ b/test/validation/api/classification/classification.c
diff --git a/test/common_plat/validation/api/classification/classification.h b/test/validation/api/classification/classification.h
index 326177ad8..326177ad8 100644
--- a/test/common_plat/validation/api/classification/classification.h
+++ b/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
index 51909d00d..51909d00d 100644
--- a/test/common_plat/validation/api/classification/classification_main.c
+++ b/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
index c31a7530e..c31a7530e 100644
--- a/test/common_plat/validation/api/classification/odp_classification_basic.c
+++ b/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
index 60e20ea87..60e20ea87 100644
--- a/test/common_plat/validation/api/classification/odp_classification_common.c
+++ b/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
index 87d04b6be..87d04b6be 100644
--- a/test/common_plat/validation/api/classification/odp_classification_test_pmr.c
+++ b/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
index c7f5d0d47..c7f5d0d47 100644
--- a/test/common_plat/validation/api/classification/odp_classification_tests.c
+++ b/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
index e1624162f..e1624162f 100644
--- a/test/common_plat/validation/api/classification/odp_classification_testsuites.h
+++ b/test/validation/api/classification/odp_classification_testsuites.h
diff --git a/test/common_plat/validation/api/cpumask/.gitignore b/test/validation/api/cpumask/.gitignore
index 655a1640f..655a1640f 100644
--- a/test/common_plat/validation/api/cpumask/.gitignore
+++ b/test/validation/api/cpumask/.gitignore
diff --git a/test/common_plat/validation/api/cpumask/Makefile.am b/test/validation/api/cpumask/Makefile.am
index ddafb9ab2..ddafb9ab2 100644
--- a/test/common_plat/validation/api/cpumask/Makefile.am
+++ b/test/validation/api/cpumask/Makefile.am
diff --git a/test/common_plat/validation/api/cpumask/cpumask.c b/test/validation/api/cpumask/cpumask.c
index e6ac83946..e6ac83946 100644
--- a/test/common_plat/validation/api/cpumask/cpumask.c
+++ b/test/validation/api/cpumask/cpumask.c
diff --git a/test/common_plat/validation/api/cpumask/cpumask.h b/test/validation/api/cpumask/cpumask.h
index 87a4512bf..87a4512bf 100644
--- a/test/common_plat/validation/api/cpumask/cpumask.h
+++ b/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
index 77fdd2280..77fdd2280 100644
--- a/test/common_plat/validation/api/cpumask/cpumask_main.c
+++ b/test/validation/api/cpumask/cpumask_main.c
diff --git a/test/common_plat/validation/api/crypto/.gitignore b/test/validation/api/crypto/.gitignore
index 0ac55e35e..0ac55e35e 100644
--- a/test/common_plat/validation/api/crypto/.gitignore
+++ b/test/validation/api/crypto/.gitignore
diff --git a/test/common_plat/validation/api/crypto/Makefile.am b/test/validation/api/crypto/Makefile.am
index 6660e1b2b..6660e1b2b 100644
--- a/test/common_plat/validation/api/crypto/Makefile.am
+++ b/test/validation/api/crypto/Makefile.am
diff --git a/test/common_plat/validation/api/crypto/crypto.c b/test/validation/api/crypto/crypto.c
index ea661241e..ea661241e 100644
--- a/test/common_plat/validation/api/crypto/crypto.c
+++ b/test/validation/api/crypto/crypto.c
diff --git a/test/common_plat/validation/api/crypto/crypto.h b/test/validation/api/crypto/crypto.h
index dd15b448f..dd15b448f 100644
--- a/test/common_plat/validation/api/crypto/crypto.h
+++ b/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
index 2d5c6c7e2..2d5c6c7e2 100644
--- a/test/common_plat/validation/api/crypto/crypto_main.c
+++ b/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
index 442336d06..442336d06 100644
--- a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c
+++ b/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
index 0f6933790..0f6933790 100644
--- a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.h
+++ b/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
index bd8bf347d..bd8bf347d 100644
--- a/test/common_plat/validation/api/crypto/test_vectors.h
+++ b/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
index 20a7ddbad..20a7ddbad 100644
--- a/test/common_plat/validation/api/crypto/test_vectors_len.h
+++ b/test/validation/api/crypto/test_vectors_len.h
diff --git a/test/common_plat/validation/api/errno/.gitignore b/test/validation/api/errno/.gitignore
index 12256e38c..12256e38c 100644
--- a/test/common_plat/validation/api/errno/.gitignore
+++ b/test/validation/api/errno/.gitignore
diff --git a/test/common_plat/validation/api/errno/Makefile.am b/test/validation/api/errno/Makefile.am
index 8f7b2e88c..8f7b2e88c 100644
--- a/test/common_plat/validation/api/errno/Makefile.am
+++ b/test/validation/api/errno/Makefile.am
diff --git a/test/common_plat/validation/api/errno/errno.c b/test/validation/api/errno/errno.c
index 929e0f409..929e0f409 100644
--- a/test/common_plat/validation/api/errno/errno.c
+++ b/test/validation/api/errno/errno.c
diff --git a/test/common_plat/validation/api/errno/errno.h b/test/validation/api/errno/errno.h
index 720385196..720385196 100644
--- a/test/common_plat/validation/api/errno/errno.h
+++ b/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
index 2f2e31554..2f2e31554 100644
--- a/test/common_plat/validation/api/errno/errno_main.c
+++ b/test/validation/api/errno/errno_main.c
diff --git a/test/common_plat/validation/api/hash/.gitignore b/test/validation/api/hash/.gitignore
index 6d0bc9314..6d0bc9314 100644
--- a/test/common_plat/validation/api/hash/.gitignore
+++ b/test/validation/api/hash/.gitignore
diff --git a/test/common_plat/validation/api/hash/Makefile.am b/test/validation/api/hash/Makefile.am
index b37f2e003..b37f2e003 100644
--- a/test/common_plat/validation/api/hash/Makefile.am
+++ b/test/validation/api/hash/Makefile.am
diff --git a/test/common_plat/validation/api/hash/hash.c b/test/validation/api/hash/hash.c
index 886df502e..886df502e 100644
--- a/test/common_plat/validation/api/hash/hash.c
+++ b/test/validation/api/hash/hash.c
diff --git a/test/common_plat/validation/api/hash/hash.h b/test/validation/api/hash/hash.h
index 936571e6a..936571e6a 100644
--- a/test/common_plat/validation/api/hash/hash.h
+++ b/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
index 089b1f95a..089b1f95a 100644
--- a/test/common_plat/validation/api/hash/hash_main.c
+++ b/test/validation/api/hash/hash_main.c
diff --git a/test/common_plat/validation/api/init/.gitignore b/test/validation/api/init/.gitignore
index f433708b0..f433708b0 100644
--- a/test/common_plat/validation/api/init/.gitignore
+++ b/test/validation/api/init/.gitignore
diff --git a/test/common_plat/validation/api/init/Makefile.am b/test/validation/api/init/Makefile.am
index ba25c61f7..ba25c61f7 100644
--- a/test/common_plat/validation/api/init/Makefile.am
+++ b/test/validation/api/init/Makefile.am
diff --git a/test/common_plat/validation/api/init/init.c b/test/validation/api/init/init.c
index d44ff2347..d44ff2347 100644
--- a/test/common_plat/validation/api/init/init.c
+++ b/test/validation/api/init/init.c
diff --git a/test/common_plat/validation/api/init/init.h b/test/validation/api/init/init.h
index cad9cf988..cad9cf988 100644
--- a/test/common_plat/validation/api/init/init.h
+++ b/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
index 1b043154f..1b043154f 100644
--- a/test/common_plat/validation/api/init/init_main_abort.c
+++ b/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
index d5d1ba6d3..d5d1ba6d3 100644
--- a/test/common_plat/validation/api/init/init_main_log.c
+++ b/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
index bb205f6df..bb205f6df 100644
--- a/test/common_plat/validation/api/init/init_main_ok.c
+++ b/test/validation/api/init/init_main_ok.c
diff --git a/test/common_plat/validation/api/lock/.gitignore b/test/validation/api/lock/.gitignore
index ff16646f4..ff16646f4 100644
--- a/test/common_plat/validation/api/lock/.gitignore
+++ b/test/validation/api/lock/.gitignore
diff --git a/test/common_plat/validation/api/lock/Makefile.am b/test/validation/api/lock/Makefile.am
index 80740282c..80740282c 100644
--- a/test/common_plat/validation/api/lock/Makefile.am
+++ b/test/validation/api/lock/Makefile.am
diff --git a/test/common_plat/validation/api/lock/lock.c b/test/validation/api/lock/lock.c
index 48a659e8e..48a659e8e 100644
--- a/test/common_plat/validation/api/lock/lock.c
+++ b/test/validation/api/lock/lock.c
diff --git a/test/common_plat/validation/api/lock/lock.h b/test/validation/api/lock/lock.h
index e0f49728b..e0f49728b 100644
--- a/test/common_plat/validation/api/lock/lock.h
+++ b/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
index e182f77a1..e182f77a1 100644
--- a/test/common_plat/validation/api/lock/lock_main.c
+++ b/test/validation/api/lock/lock_main.c
diff --git a/test/common_plat/validation/api/packet/.gitignore b/test/validation/api/packet/.gitignore
index c05530d2d..c05530d2d 100644
--- a/test/common_plat/validation/api/packet/.gitignore
+++ b/test/validation/api/packet/.gitignore
diff --git a/test/common_plat/validation/api/packet/Makefile.am b/test/validation/api/packet/Makefile.am
index fb3569977..fb3569977 100644
--- a/test/common_plat/validation/api/packet/Makefile.am
+++ b/test/validation/api/packet/Makefile.am
diff --git a/test/common_plat/validation/api/packet/packet.c b/test/validation/api/packet/packet.c
index 641654642..641654642 100644
--- a/test/common_plat/validation/api/packet/packet.c
+++ b/test/validation/api/packet/packet.c
diff --git a/test/common_plat/validation/api/packet/packet.h b/test/validation/api/packet/packet.h
index 783b7a117..783b7a117 100644
--- a/test/common_plat/validation/api/packet/packet.h
+++ b/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
index a80e29a23..a80e29a23 100644
--- a/test/common_plat/validation/api/packet/packet_main.c
+++ b/test/validation/api/packet/packet_main.c
diff --git a/test/common_plat/validation/api/pktio/.gitignore b/test/validation/api/pktio/.gitignore
index 1a5dd46e4..1a5dd46e4 100644
--- a/test/common_plat/validation/api/pktio/.gitignore
+++ b/test/validation/api/pktio/.gitignore
diff --git a/test/common_plat/validation/api/pktio/Makefile.am b/test/validation/api/pktio/Makefile.am
index eb4b60383..eb4b60383 100644
--- a/test/common_plat/validation/api/pktio/Makefile.am
+++ b/test/validation/api/pktio/Makefile.am
diff --git a/test/common_plat/validation/api/pktio/parser.c b/test/validation/api/pktio/parser.c
index dd293a447..dd293a447 100644
--- a/test/common_plat/validation/api/pktio/parser.c
+++ b/test/validation/api/pktio/parser.c
diff --git a/test/common_plat/validation/api/pktio/parser.h b/test/validation/api/pktio/parser.h
index 5cc2b988c..5cc2b988c 100644
--- a/test/common_plat/validation/api/pktio/parser.h
+++ b/test/validation/api/pktio/parser.h
diff --git a/test/common_plat/validation/api/pktio/pktio.c b/test/validation/api/pktio/pktio.c
index 6a085729b..6a085729b 100644
--- a/test/common_plat/validation/api/pktio/pktio.c
+++ b/test/validation/api/pktio/pktio.c
diff --git a/test/common_plat/validation/api/pktio/pktio.h b/test/validation/api/pktio/pktio.h
index b8799d9eb..b8799d9eb 100644
--- a/test/common_plat/validation/api/pktio/pktio.h
+++ b/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
index 13d2407a1..13d2407a1 100644
--- a/test/common_plat/validation/api/pktio/pktio_main.c
+++ b/test/validation/api/pktio/pktio_main.c
diff --git a/test/common_plat/validation/api/pool/.gitignore b/test/validation/api/pool/.gitignore
index fc91b28d6..fc91b28d6 100644
--- a/test/common_plat/validation/api/pool/.gitignore
+++ b/test/validation/api/pool/.gitignore
diff --git a/test/common_plat/validation/api/pool/Makefile.am b/test/validation/api/pool/Makefile.am
index 85a37b053..85a37b053 100644
--- a/test/common_plat/validation/api/pool/Makefile.am
+++ b/test/validation/api/pool/Makefile.am
diff --git a/test/common_plat/validation/api/pool/pool.c b/test/validation/api/pool/pool.c
index e633137ab..e633137ab 100644
--- a/test/common_plat/validation/api/pool/pool.c
+++ b/test/validation/api/pool/pool.c
diff --git a/test/common_plat/validation/api/pool/pool.h b/test/validation/api/pool/pool.h
index 29e517633..29e517633 100644
--- a/test/common_plat/validation/api/pool/pool.h
+++ b/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
index c1eb7b7c5..c1eb7b7c5 100644
--- a/test/common_plat/validation/api/pool/pool_main.c
+++ b/test/validation/api/pool/pool_main.c
diff --git a/test/common_plat/validation/api/queue/.gitignore b/test/validation/api/queue/.gitignore
index 469506a13..469506a13 100644
--- a/test/common_plat/validation/api/queue/.gitignore
+++ b/test/validation/api/queue/.gitignore
diff --git a/test/common_plat/validation/api/queue/Makefile.am b/test/validation/api/queue/Makefile.am
index a5b6a9b10..a5b6a9b10 100644
--- a/test/common_plat/validation/api/queue/Makefile.am
+++ b/test/validation/api/queue/Makefile.am
diff --git a/test/common_plat/validation/api/queue/queue.c b/test/validation/api/queue/queue.c
index 94d0a2fd8..94d0a2fd8 100644
--- a/test/common_plat/validation/api/queue/queue.c
+++ b/test/validation/api/queue/queue.c
diff --git a/test/common_plat/validation/api/queue/queue.h b/test/validation/api/queue/queue.h
index 6b787b1d6..6b787b1d6 100644
--- a/test/common_plat/validation/api/queue/queue.h
+++ b/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
index 7ed054119..7ed054119 100644
--- a/test/common_plat/validation/api/queue/queue_main.c
+++ b/test/validation/api/queue/queue_main.c
diff --git a/test/common_plat/validation/api/random/.gitignore b/test/validation/api/random/.gitignore
index 2c88ec0b8..2c88ec0b8 100644
--- a/test/common_plat/validation/api/random/.gitignore
+++ b/test/validation/api/random/.gitignore
diff --git a/test/common_plat/validation/api/random/Makefile.am b/test/validation/api/random/Makefile.am
index e026f045a..e026f045a 100644
--- a/test/common_plat/validation/api/random/Makefile.am
+++ b/test/validation/api/random/Makefile.am
diff --git a/test/common_plat/validation/api/random/random.c b/test/validation/api/random/random.c
index 071c265f0..071c265f0 100644
--- a/test/common_plat/validation/api/random/random.c
+++ b/test/validation/api/random/random.c
diff --git a/test/common_plat/validation/api/random/random.h b/test/validation/api/random/random.h
index c4bca7827..c4bca7827 100644
--- a/test/common_plat/validation/api/random/random.h
+++ b/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
index ca9f5262d..ca9f5262d 100644
--- a/test/common_plat/validation/api/random/random_main.c
+++ b/test/validation/api/random/random_main.c
diff --git a/test/common_plat/validation/api/scheduler/.gitignore b/test/validation/api/scheduler/.gitignore
index b4eb30091..b4eb30091 100644
--- a/test/common_plat/validation/api/scheduler/.gitignore
+++ b/test/validation/api/scheduler/.gitignore
diff --git a/test/common_plat/validation/api/scheduler/Makefile.am b/test/validation/api/scheduler/Makefile.am
index 6c71b0100..6c71b0100 100644
--- a/test/common_plat/validation/api/scheduler/Makefile.am
+++ b/test/validation/api/scheduler/Makefile.am
diff --git a/test/common_plat/validation/api/scheduler/scheduler.c b/test/validation/api/scheduler/scheduler.c
index 963275be5..963275be5 100644
--- a/test/common_plat/validation/api/scheduler/scheduler.c
+++ b/test/validation/api/scheduler/scheduler.c
diff --git a/test/common_plat/validation/api/scheduler/scheduler.h b/test/validation/api/scheduler/scheduler.h
index a619d89b2..a619d89b2 100644
--- a/test/common_plat/validation/api/scheduler/scheduler.h
+++ b/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
index 73f3cedd0..73f3cedd0 100644
--- a/test/common_plat/validation/api/scheduler/scheduler_main.c
+++ b/test/validation/api/scheduler/scheduler_main.c
diff --git a/test/common_plat/validation/api/shmem/.gitignore b/test/validation/api/shmem/.gitignore
index 4d82fd53a..4d82fd53a 100644
--- a/test/common_plat/validation/api/shmem/.gitignore
+++ b/test/validation/api/shmem/.gitignore
diff --git a/test/common_plat/validation/api/shmem/Makefile.am b/test/validation/api/shmem/Makefile.am
index d955cc22e..d955cc22e 100644
--- a/test/common_plat/validation/api/shmem/Makefile.am
+++ b/test/validation/api/shmem/Makefile.am
diff --git a/test/common_plat/validation/api/shmem/shmem.c b/test/validation/api/shmem/shmem.c
index 08587940c..08587940c 100644
--- a/test/common_plat/validation/api/shmem/shmem.c
+++ b/test/validation/api/shmem/shmem.c
diff --git a/test/common_plat/validation/api/shmem/shmem.h b/test/validation/api/shmem/shmem.h
index 092aa8005..092aa8005 100644
--- a/test/common_plat/validation/api/shmem/shmem.h
+++ b/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
index d51d4d83c..d51d4d83c 100644
--- a/test/common_plat/validation/api/shmem/shmem_main.c
+++ b/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
index 37828330a..37828330a 100644
--- a/test/common_plat/validation/api/std_clib/.gitignore
+++ b/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
index 919c2556f..919c2556f 100644
--- a/test/common_plat/validation/api/std_clib/Makefile.am
+++ b/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
index 33128eef6..33128eef6 100644
--- a/test/common_plat/validation/api/std_clib/std_clib.c
+++ b/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
index 2804f27e2..2804f27e2 100644
--- a/test/common_plat/validation/api/std_clib/std_clib.h
+++ b/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
index dc63bb5b3..dc63bb5b3 100644
--- a/test/common_plat/validation/api/std_clib/std_clib_main.c
+++ b/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
index 347b1ee21..347b1ee21 100644
--- a/test/common_plat/validation/api/system/.gitignore
+++ b/test/validation/api/system/.gitignore
diff --git a/test/common_plat/validation/api/system/Makefile.am b/test/validation/api/system/Makefile.am
index 15e6d49a5..15e6d49a5 100644
--- a/test/common_plat/validation/api/system/Makefile.am
+++ b/test/validation/api/system/Makefile.am
diff --git a/test/common_plat/validation/api/system/system.c b/test/validation/api/system/system.c
index 6873fcc45..6873fcc45 100644
--- a/test/common_plat/validation/api/system/system.c
+++ b/test/validation/api/system/system.c
diff --git a/test/common_plat/validation/api/system/system.h b/test/validation/api/system/system.h
index c33729b94..c33729b94 100644
--- a/test/common_plat/validation/api/system/system.h
+++ b/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
index 01720c6aa..01720c6aa 100644
--- a/test/common_plat/validation/api/system/system_main.c
+++ b/test/validation/api/system/system_main.c
diff --git a/test/common_plat/validation/api/thread/.gitignore b/test/validation/api/thread/.gitignore
index ab1787d97..ab1787d97 100644
--- a/test/common_plat/validation/api/thread/.gitignore
+++ b/test/validation/api/thread/.gitignore
diff --git a/test/common_plat/validation/api/thread/Makefile.am b/test/validation/api/thread/Makefile.am
index 59e136b24..59e136b24 100644
--- a/test/common_plat/validation/api/thread/Makefile.am
+++ b/test/validation/api/thread/Makefile.am
diff --git a/test/common_plat/validation/api/thread/thread.c b/test/validation/api/thread/thread.c
index ada4affcb..ada4affcb 100644
--- a/test/common_plat/validation/api/thread/thread.c
+++ b/test/validation/api/thread/thread.c
diff --git a/test/common_plat/validation/api/thread/thread.h b/test/validation/api/thread/thread.h
index d511c9259..d511c9259 100644
--- a/test/common_plat/validation/api/thread/thread.h
+++ b/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
index 2e8328364..2e8328364 100644
--- a/test/common_plat/validation/api/thread/thread_main.c
+++ b/test/validation/api/thread/thread_main.c
diff --git a/test/common_plat/validation/api/time/.gitignore b/test/validation/api/time/.gitignore
index 0ef3e6162..0ef3e6162 100644
--- a/test/common_plat/validation/api/time/.gitignore
+++ b/test/validation/api/time/.gitignore
diff --git a/test/common_plat/validation/api/time/Makefile.am b/test/validation/api/time/Makefile.am
index faed577f0..faed577f0 100644
--- a/test/common_plat/validation/api/time/Makefile.am
+++ b/test/validation/api/time/Makefile.am
diff --git a/test/common_plat/validation/api/time/time.c b/test/validation/api/time/time.c
index ef1372578..ef1372578 100644
--- a/test/common_plat/validation/api/time/time.c
+++ b/test/validation/api/time/time.c
diff --git a/test/common_plat/validation/api/time/time.sh b/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
index c39a0ea13..c39a0ea13 100644
--- a/test/common_plat/validation/api/time/time_main.c
+++ b/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
index 109562944..109562944 100644
--- a/test/common_plat/validation/api/time/time_test.h
+++ b/test/validation/api/time/time_test.h
diff --git a/test/common_plat/validation/api/timer/.gitignore b/test/validation/api/timer/.gitignore
index 74e8fa992..74e8fa992 100644
--- a/test/common_plat/validation/api/timer/.gitignore
+++ b/test/validation/api/timer/.gitignore
diff --git a/test/common_plat/validation/api/timer/Makefile.am b/test/validation/api/timer/Makefile.am
index 4f79020dd..4f79020dd 100644
--- a/test/common_plat/validation/api/timer/Makefile.am
+++ b/test/validation/api/timer/Makefile.am
diff --git a/test/common_plat/validation/api/timer/timer.c b/test/validation/api/timer/timer.c
index e88f21a7e..e88f21a7e 100644
--- a/test/common_plat/validation/api/timer/timer.c
+++ b/test/validation/api/timer/timer.c
diff --git a/test/common_plat/validation/api/timer/timer.h b/test/validation/api/timer/timer.h
index bd304fffd..bd304fffd 100644
--- a/test/common_plat/validation/api/timer/timer.h
+++ b/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
index f65c1e3a0..f65c1e3a0 100644
--- a/test/common_plat/validation/api/timer/timer_main.c
+++ b/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
index efd07a27d..efd07a27d 100644
--- a/test/common_plat/validation/api/traffic_mngr/.gitignore
+++ b/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
index 3884a13c5..3884a13c5 100644
--- a/test/common_plat/validation/api/traffic_mngr/Makefile.am
+++ b/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
index fb7bb4611..fb7bb4611 100644
--- a/test/common_plat/validation/api/traffic_mngr/traffic_mngr.c
+++ b/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
index af115fef7..af115fef7 100644
--- a/test/common_plat/validation/api/traffic_mngr/traffic_mngr.h
+++ b/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
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
index ec4555e60..ec4555e60 100644
--- a/test/common_plat/validation/api/traffic_mngr/traffic_mngr_main.c
+++ b/test/validation/api/traffic_mngr/traffic_mngr_main.c