example: generator: use platform defined pktio_env

odp_generator uses hard coded null interface to validate functionality.
Patch optimises it to use platform defined pktio_env.

Signed-off-by: Sunil Kumar Kori <skori@marvell.com>
Reviewed-by: Matias Elo <matias.elo@nokia.com>

8 files changed, 73 insertions, 26 deletions

diff --git a/example/generator/.gitignore b/example/generator/.gitignore
index 85aa1d1ec..37364a254 100644
--- a/example/generator/.gitignore
+++ b/example/generator/.gitignore
@@ -1 +1,2 @@
 odp_generator
+pktio_env
diff --git a/example/generator/Makefile.am b/example/generator/Makefile.am
index fd32949e2..c3c08a663 100644
--- a/example/generator/Makefile.am
+++ b/example/generator/Makefile.am
@@ -7,10 +7,9 @@ odp_generator_SOURCES = odp_generator.c
 TEST_EXTENSIONS = .sh
 
 if test_example
-TESTS = generator_null_test.sh
-TESTS_ENVIRONMENT += ODP_PLATFORM=$(with_platform)
+TESTS = generator_run.sh
 endif
-EXTRA_DIST = generator_null_test.sh
+EXTRA_DIST = generator_run.sh
 
 # If building out-of-tree, make check will not copy the scripts and data to the
 # $(builddir) assuming that all commands are run locally. However this prevents
@@ -25,6 +24,8 @@ all-local:
 			fi \
 		done \
 	fi
+	ln -f -s $(top_srcdir)/platform/$(with_platform)/test/example/generator/pktio_env \
+		pktio_env
 clean-local:
 	if [ "x$(srcdir)" != "x$(builddir)" ]; then \
 		for f in $(EXTRA_DIST); do \
diff --git a/example/generator/generator_null_test.sh b/example/generator/generator_null_test.sh
deleted file mode 100755
index a598ffd92..000000000
--- a/example/generator/generator_null_test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2018, Linaro Limited
-# All rights reserved.
-#
-# SPDX-License-Identifier:     BSD-3-Clause
-#
-
-if [ -n "${ODP_PLATFORM}" -a "x${ODP_PLATFORM}" != "xlinux-generic" ]
-then
-	echo "null pktio might be unsupported on this platform, skipping"
-	exit 77
-fi
-
-./odp_generator${EXEEXT} -w 1 -n 1 -I null:0 -m u
-STATUS=$?
-
-if [ "$STATUS" -ne 0 ]; then
-  echo "Error: status was: $STATUS, expected 0"
-  exit 1
-fi
-
-exit 0
diff --git a/example/generator/generator_run.sh b/example/generator/generator_run.sh
new file mode 100755
index 000000000..528c1b595
--- /dev/null
+++ b/example/generator/generator_run.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+#
+# Copyright (c) 2020, Marvell
+# All rights reserved.
+#
+# SPDX-License-Identifier:     BSD-3-Clause
+#
+
+if  [ -f ./pktio_env ]; then
+	. ./pktio_env
+else
+	echo "BUG: unable to find pktio_env!"
+	echo "pktio_env has to be in current directory"
+	exit 1
+fi
+
+setup_interfaces
+
+./odp_generator${EXEEXT} -w 1 -n 1 -I $IF0 -m u
+STATUS=$?
+
+if [ "$STATUS" -ne 0 ]; then
+  echo "Error: status was: $STATUS, expected 0"
+  exit 1
+fi
+
+validate_result
+
+cleanup_interfaces
+
+exit 0
diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4
index 8d89c7442..a51a1a80c 100644
--- a/platform/linux-generic/m4/configure.m4
+++ b/platform/linux-generic/m4/configure.m4
@@ -44,6 +44,7 @@ AC_CONFIG_FILES([platform/linux-generic/Makefile
 		 platform/linux-generic/dumpconfig/Makefile
 		 platform/linux-generic/test/Makefile
 		 platform/linux-generic/test/example/Makefile
+		 platform/linux-generic/test/example/generator/Makefile
 		 platform/linux-generic/test/example/l2fwd_simple/Makefile
 		 platform/linux-generic/test/example/l3fwd/Makefile
 		 platform/linux-generic/test/example/packet/Makefile
diff --git a/platform/linux-generic/test/example/Makefile.am b/platform/linux-generic/test/example/Makefile.am
index 2e6a7ce6c..7c0097506 100644
--- a/platform/linux-generic/test/example/Makefile.am
+++ b/platform/linux-generic/test/example/Makefile.am
@@ -1,4 +1,5 @@
 SUBDIRS = \
+	generator \
 	l2fwd_simple \
 	l3fwd \
 	packet \
diff --git a/platform/linux-generic/test/example/generator/Makefile.am b/platform/linux-generic/test/example/generator/Makefile.am
new file mode 100644
index 000000000..2ffced539
--- /dev/null
+++ b/platform/linux-generic/test/example/generator/Makefile.am
@@ -0,0 +1 @@
+EXTRA_DIST = pktio_env
diff --git a/platform/linux-generic/test/example/generator/pktio_env b/platform/linux-generic/test/example/generator/pktio_env
new file mode 100644
index 000000000..06af667e8
--- /dev/null
+++ b/platform/linux-generic/test/example/generator/pktio_env
@@ -0,0 +1,34 @@
+#!/bin/sh
+#
+# Copyright (C) 2020, Marvell
+# All rights reserved.
+#
+# SPDX-License-Identifier:	BSD-3-Clause
+#
+# Script to setup interfaces used for running application on linux-generic.
+#
+# Generator uses null interfaces to validate udp mode.
+#
+# Network set-up
+# IF0 ---> null:0
+
+IF0=null:0
+
+if [ "$0" = "$BASH_SOURCE" ]; then
+	echo "Error: Platform specific env file has to be sourced."
+fi
+
+validate_result()
+{
+	return 0
+}
+
+setup_interfaces()
+{
+	return 0
+}
+
+cleanup_interfaces()
+{
+	return 0
+}