diff mbox series

[v1,6/7] validation: move traffic_mngr test to api/ dir

Message ID 1519290010-13383-7-git-send-email-odpbot@yandex.ru
State Superseded
Headers show
Series [v1,1/7] Revert "example: generator move to platform tests" | expand

Commit Message

Github ODP bot Feb. 22, 2018, 9 a.m. UTC 
From: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>


Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>

---
/** Email created from pull request 496 (lumag:tests-fix-2)
 ** https://github.com/Linaro/odp/pull/496
 ** Patch: https://github.com/Linaro/odp/pull/496.patch
 ** Base sha: 5a58bbf2bb331fd7dde2ebbc0430634ace6900fb
 ** Merge commit sha: 2ca48deb89c7ac000bd44a1da037c36de66720cb
 **/
 test/m4/configure.m4                                   |  3 +--
 test/validation/api/.gitignore                         |  1 +
 test/validation/api/Makefile.am                        | 14 ++++++++++----
 test/validation/api/{traffic_mngr => }/traffic_mngr.c  |  0
 test/validation/api/{traffic_mngr => }/traffic_mngr.sh |  4 ++--
 test/validation/api/traffic_mngr/.gitignore            |  1 -
 test/validation/api/traffic_mngr/Makefile.am           | 10 ----------
 7 files changed, 14 insertions(+), 19 deletions(-)
 rename test/validation/api/{traffic_mngr => }/traffic_mngr.c (100%)
 rename test/validation/api/{traffic_mngr => }/traffic_mngr.sh (90%)
 delete mode 100644 test/validation/api/traffic_mngr/.gitignore
 delete mode 100644 test/validation/api/traffic_mngr/Makefile.am
diff mbox series

Patch

diff --git a/test/m4/configure.m4 b/test/m4/configure.m4
index 5a0b4d685..18c71d799 100644
--- a/test/m4/configure.m4
+++ b/test/m4/configure.m4
@@ -8,5 +8,4 @@  AC_CONFIG_FILES([test/Makefile
 		 test/performance/Makefile
 		 test/validation/Makefile
 		 test/validation/api/Makefile
-		 test/validation/api/pktio/Makefile
-		 test/validation/api/traffic_mngr/Makefile])
+		 test/validation/api/pktio/Makefile])
diff --git a/test/validation/api/.gitignore b/test/validation/api/.gitignore
index 6fb6ee62e..f6bf6e54b 100644
--- a/test/validation/api/.gitignore
+++ b/test/validation/api/.gitignore
@@ -30,3 +30,4 @@  system_main
 thread_main
 time_main
 timer_main
+traffic_mngr_main
diff --git a/test/validation/api/Makefile.am b/test/validation/api/Makefile.am
index bc3a429d2..b45828c54 100644
--- a/test/validation/api/Makefile.am
+++ b/test/validation/api/Makefile.am
@@ -1,6 +1,5 @@ 
 ODP_MODULES = \
-	      pktio \
-	      traffic_mngr
+	      pktio
 
 SUBDIRS = $(ODP_MODULES)
 
@@ -35,7 +34,8 @@  test_PROGRAMS = \
 		system_main \
 		thread_main \
 		time_main \
-		timer_main
+		timer_main \
+		traffic_mngr_main
 
 noinst_LTLIBRARIES = libtestipsec.la
 libtestipsec_la_SOURCES = \
@@ -79,6 +79,11 @@  thread_main_SOURCES = thread.c
 thread_main_LDADD = $(LDADD) $(LIBTHRMASK_COMMON)
 time_main_SOURCES = time.c
 timer_main_SOURCES = timer.c
+traffic_mngr_main_SOURCES = traffic_mngr.c
+traffic_mngr_main_LDADD = $(LDADD) -lm
+
+dist_check_SCRIPTS = traffic_mngr.sh
+test_SCRIPTS = $(dist_check_SCRIPTS)
 
 classification_main_SOURCES = \
 				   classification_basic.c \
@@ -90,6 +95,7 @@  classification_main_SOURCES = \
 				   classification.h
 
 TESTS_ENVIRONMENT += TEST_DIR=${top_builddir}/test/validation
+TEST_EXTENSIONS = .sh
 
 TESTS = \
 	atomic_main$(EXEEXT) \
@@ -121,7 +127,7 @@  TESTS = \
 	thread_main$(EXEEXT) \
 	time_main$(EXEEXT) \
 	timer_main$(EXEEXT) \
-	traffic_mngr/traffic_mngr.sh
+	traffic_mngr.sh
 
 TESTNAME = validation
 
diff --git a/test/validation/api/traffic_mngr/traffic_mngr.c b/test/validation/api/traffic_mngr.c
similarity index 100%
rename from test/validation/api/traffic_mngr/traffic_mngr.c
rename to test/validation/api/traffic_mngr.c
diff --git a/test/validation/api/traffic_mngr/traffic_mngr.sh b/test/validation/api/traffic_mngr.sh
similarity index 90%
rename from test/validation/api/traffic_mngr/traffic_mngr.sh
rename to test/validation/api/traffic_mngr.sh
index c88aa805c..0b5f3a03b 100755
--- a/test/validation/api/traffic_mngr/traffic_mngr.sh
+++ b/test/validation/api/traffic_mngr.sh
@@ -12,8 +12,8 @@ 
 # -in the validation when running standalone (./traffic_mngr) intree.
 # -in the current directory.
 # running stand alone out of tree requires setting PATH
-PATH=${TEST_DIR}/api/traffic_mngr:$PATH
-PATH=$(dirname $0)/../../../../validation/api/traffic_mngr:$PATH
+PATH=${TEST_DIR}/api:$PATH
+PATH=$(dirname $0)/../../../../validation/api:$PATH
 PATH=$(dirname $0):$PATH
 PATH=`pwd`:$PATH
 
diff --git a/test/validation/api/traffic_mngr/.gitignore b/test/validation/api/traffic_mngr/.gitignore
deleted file mode 100644
index efd07a27d..000000000
--- a/test/validation/api/traffic_mngr/.gitignore
+++ /dev/null
@@ -1 +0,0 @@ 
-traffic_mngr_main
diff --git a/test/validation/api/traffic_mngr/Makefile.am b/test/validation/api/traffic_mngr/Makefile.am
deleted file mode 100644
index a9b8550d7..000000000
--- a/test/validation/api/traffic_mngr/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@ 
-include ../Makefile.inc
-
-TESTS_ENVIRONMENT += TEST_DIR=${builddir}
-
-test_PROGRAMS = traffic_mngr_main
-traffic_mngr_main_SOURCES = traffic_mngr.c
-LDADD += -lm
-
-dist_check_SCRIPTS = traffic_mngr.sh
-test_SCRIPTS = $(dist_check_SCRIPTS)