diff mbox

[1/2] linux-generic: test: move validation tests to their own directory

Message ID 1452007772-11744-2-git-send-email-mike.holmes@linaro.org
State New
Headers show

Commit Message

Mike Holmes Jan. 5, 2016, 3:29 p.m. UTC 
Simplify adding platform performance tests by mirroring the test directory
structure and moving the validation tests to their own directory.

Signed-off-by: Mike Holmes <mike.holmes@linaro.org>
---
 platform/linux-generic/m4/configure.m4             |  3 +-
 platform/linux-generic/test/Makefile.am            | 51 ++--------------------
 .../test/{ => validation}/Makefile.am              | 14 +-----
 .../test/{ => validation}/pktio/.gitignore         |  0
 .../test/{ => validation}/pktio/Makefile.am        |  0
 .../test/{ => validation}/pktio/pktio_env          |  0
 .../test/{ => validation}/pktio/pktio_run          |  0
 .../test/{ => validation}/pktio/pktio_run_pcap     |  0
 .../test/{ => validation}/pktio/pktio_run_tap      |  0
 test/performance/odp_l2fwd_run                     |  6 +--
 10 files changed, 10 insertions(+), 64 deletions(-)
 copy platform/linux-generic/test/{ => validation}/Makefile.am (88%)
 rename platform/linux-generic/test/{ => validation}/pktio/.gitignore (100%)
 rename platform/linux-generic/test/{ => validation}/pktio/Makefile.am (100%)
 rename platform/linux-generic/test/{ => validation}/pktio/pktio_env (100%)
 rename platform/linux-generic/test/{ => validation}/pktio/pktio_run (100%)
 rename platform/linux-generic/test/{ => validation}/pktio/pktio_run_pcap (100%)
 rename platform/linux-generic/test/{ => validation}/pktio/pktio_run_tap (100%)
diff mbox

Patch

diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4
index df6dc64..97c15fa 100644
--- a/platform/linux-generic/m4/configure.m4
+++ b/platform/linux-generic/m4/configure.m4
@@ -23,4 +23,5 @@  m4_include([platform/linux-generic/m4/odp_pcap.m4])
 
 AC_CONFIG_FILES([platform/linux-generic/Makefile
 		 platform/linux-generic/test/Makefile
-		 platform/linux-generic/test/pktio/Makefile])
+		 platform/linux-generic/test/validation/Makefile
+		 platform/linux-generic/test/validation/pktio/Makefile])
diff --git a/platform/linux-generic/test/Makefile.am b/platform/linux-generic/test/Makefile.am
index e629872..3cf638d 100644
--- a/platform/linux-generic/test/Makefile.am
+++ b/platform/linux-generic/test/Makefile.am
@@ -1,56 +1,13 @@ 
-include $(top_srcdir)/test/Makefile.inc
-TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/validation
-
-ODP_MODULES = pktio
+SUBDIRS =
 
 if test_vald
-TESTS = pktio/pktio_run \
-	pktio/pktio_run_tap \
-	${top_builddir}/test/validation/buffer/buffer_main$(EXEEXT) \
-	${top_builddir}/test/validation/classification/classification_main$(EXEEXT) \
-	${top_builddir}/test/validation/config/config_main$(EXEEXT) \
-	${top_builddir}/test/validation/cpumask/cpumask_main$(EXEEXT) \
-	${top_builddir}/test/validation/crypto/crypto_main$(EXEEXT) \
-	${top_builddir}/test/validation/errno/errno_main$(EXEEXT) \
-	${top_builddir}/test/validation/hash/hash_main$(EXEEXT) \
-	${top_builddir}/test/validation/init/init_main_ok$(EXEEXT) \
-	${top_builddir}/test/validation/init/init_main_abort$(EXEEXT) \
-	${top_builddir}/test/validation/init/init_main_log$(EXEEXT) \
-	${top_builddir}/test/validation/packet/packet_main$(EXEEXT) \
-	${top_builddir}/test/validation/pool/pool_main$(EXEEXT) \
-	${top_builddir}/test/validation/queue/queue_main$(EXEEXT) \
-	${top_builddir}/test/validation/random/random_main$(EXEEXT) \
-	${top_builddir}/test/validation/scheduler/scheduler_main$(EXEEXT) \
-	${top_builddir}/test/validation/std_clib/std_clib_main$(EXEEXT) \
-	${top_builddir}/test/validation/synchronizers/synchronizers_main$(EXEEXT) \
-	${top_builddir}/test/validation/thread/thread_main$(EXEEXT) \
-	${top_builddir}/test/validation/time/time_main$(EXEEXT) \
-	${top_builddir}/test/validation/timer/timer_main$(EXEEXT) \
-	${top_builddir}/test/validation/shmem/shmem_main$(EXEEXT) \
-	${top_builddir}/test/validation/system/system_main$(EXEEXT)
-
-SUBDIRS = $(ODP_MODULES)
-
-if HAVE_PCAP
-TESTS += pktio/pktio_run_pcap
+SUBDIRS += validation
 endif
-endif
-
-dist_check_SCRIPTS = run-test tests-validation.env $(LOG_COMPILER)
-
-test_SCRIPTS = $(dist_check_SCRIPTS)
-
-tests-validation.env:
-	echo "TESTS=\"$(TESTS)\""    > $@
-	echo "$(TESTS_ENVIRONMENT)" >> $@
-	echo "$(LOG_COMPILER)"      >> $@
 
 if test_installdir
 installcheck-local:
 	$(DESTDIR)/$(testdir)/run-test
 endif
 
-#performance tests refer to pktio_env
-if test_perf
-SUBDIRS = pktio
-endif
+dist_check_SCRIPTS = run-test $(LOG_COMPILER)
+test_SCRIPTS = $(dist_check_SCRIPTS)
\ No newline at end of file
diff --git a/platform/linux-generic/test/Makefile.am b/platform/linux-generic/test/validation/Makefile.am
similarity index 88%
copy from platform/linux-generic/test/Makefile.am
copy to platform/linux-generic/test/validation/Makefile.am
index e629872..39c6cdd 100644
--- a/platform/linux-generic/test/Makefile.am
+++ b/platform/linux-generic/test/validation/Makefile.am
@@ -3,7 +3,6 @@  TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/validation
 
 ODP_MODULES = pktio
 
-if test_vald
 TESTS = pktio/pktio_run \
 	pktio/pktio_run_tap \
 	${top_builddir}/test/validation/buffer/buffer_main$(EXEEXT) \
@@ -34,9 +33,8 @@  SUBDIRS = $(ODP_MODULES)
 if HAVE_PCAP
 TESTS += pktio/pktio_run_pcap
 endif
-endif
 
-dist_check_SCRIPTS = run-test tests-validation.env $(LOG_COMPILER)
+dist_check_SCRIPTS = tests-validation.env
 
 test_SCRIPTS = $(dist_check_SCRIPTS)
 
@@ -44,13 +42,3 @@  tests-validation.env:
 	echo "TESTS=\"$(TESTS)\""    > $@
 	echo "$(TESTS_ENVIRONMENT)" >> $@
 	echo "$(LOG_COMPILER)"      >> $@
-
-if test_installdir
-installcheck-local:
-	$(DESTDIR)/$(testdir)/run-test
-endif
-
-#performance tests refer to pktio_env
-if test_perf
-SUBDIRS = pktio
-endif
diff --git a/platform/linux-generic/test/pktio/.gitignore b/platform/linux-generic/test/validation/pktio/.gitignore
similarity index 100%
rename from platform/linux-generic/test/pktio/.gitignore
rename to platform/linux-generic/test/validation/pktio/.gitignore
diff --git a/platform/linux-generic/test/pktio/Makefile.am b/platform/linux-generic/test/validation/pktio/Makefile.am
similarity index 100%
rename from platform/linux-generic/test/pktio/Makefile.am
rename to platform/linux-generic/test/validation/pktio/Makefile.am
diff --git a/platform/linux-generic/test/pktio/pktio_env b/platform/linux-generic/test/validation/pktio/pktio_env
similarity index 100%
rename from platform/linux-generic/test/pktio/pktio_env
rename to platform/linux-generic/test/validation/pktio/pktio_env
diff --git a/platform/linux-generic/test/pktio/pktio_run b/platform/linux-generic/test/validation/pktio/pktio_run
similarity index 100%
rename from platform/linux-generic/test/pktio/pktio_run
rename to platform/linux-generic/test/validation/pktio/pktio_run
diff --git a/platform/linux-generic/test/pktio/pktio_run_pcap b/platform/linux-generic/test/validation/pktio/pktio_run_pcap
similarity index 100%
rename from platform/linux-generic/test/pktio/pktio_run_pcap
rename to platform/linux-generic/test/validation/pktio/pktio_run_pcap
diff --git a/platform/linux-generic/test/pktio/pktio_run_tap b/platform/linux-generic/test/validation/pktio/pktio_run_tap
similarity index 100%
rename from platform/linux-generic/test/pktio/pktio_run_tap
rename to platform/linux-generic/test/validation/pktio/pktio_run_tap
diff --git a/test/performance/odp_l2fwd_run b/test/performance/odp_l2fwd_run
index 001d8c2..85ceaa4 100755
--- a/test/performance/odp_l2fwd_run
+++ b/test/performance/odp_l2fwd_run
@@ -37,11 +37,11 @@  elif  [ "$ODP_PLATFORM" = "" ]; then
 	echo "$0: error: ODP_PLATFORM must be defined"
 	# not skipped as this should never happen via "make check"
 	exit 1
-elif [ -f ${TEST_SRC_DIR}/../../platform/$ODP_PLATFORM/test/pktio/pktio_env ]; then
-	. ${TEST_SRC_DIR}/../../platform/$ODP_PLATFORM/test/pktio/pktio_env
+elif [ -f ${TEST_SRC_DIR}/../../platform/$ODP_PLATFORM/test/validation/pktio/pktio_env ]; then
+	. ${TEST_SRC_DIR}/../../platform/$ODP_PLATFORM/test/validation/pktio/pktio_env
 else
 	echo "BUG: unable to find pktio_env!"
-	echo "pktio_env has to be in current directory or in platform/\$ODP_PLATFORM/test."
+	echo "pktio_env has to be in current directory or in platform/\$ODP_PLATFORM/validation/test."
 	echo "ODP_PLATFORM=\"$ODP_PLATFORM\""
 	exit 1
 fi