tldk_test: added copy command to makefile to make test_scapy_gen.py visible

Change-Id: Iedad6db1808a20d0bd00b9d23f489dffd3ef0a4b
Signed-off-by: Kopec, TomaszX <tomaszx.kopec@intel.com>
Signed-off-by: Mohammad Abdul Awal <mohammad.abdul.awal@intel.com>

diff --git a/test/gtest/Makefile b/test/gtest/Makefile
index 293a961..9b1341d 100644 (file)
--- a/test/gtest/Makefile
+++ b/test/gtest/Makefile
@@ -79,6 +79,8 @@ SRCS-y += test_tle_udp_stream_gen.cpp
 #SRCS-y += test_tle_tcp_stream.cpp
 #SRCS-y += test_tle_tcp_stream_gen.cpp
 
+SYMLINK-y-app += test_scapy_gen.py
+
 CXXFLAGS += -std=c++11
 
 ifeq ($(shell test $(GCC_VERSION) -lt 50 && echo 1), 1)

diff --git a/test/gtest/main.cpp b/test/gtest/main.cpp
index 17cdccd..53dcf78 100644 (file)
--- a/test/gtest/main.cpp
+++ b/test/gtest/main.cpp
@@ -28,12 +28,14 @@
 #include "test_common.h"
 
 struct rte_mempool *mbuf_pool;
+char binpath[PATH_MAX];
 
 int
 main(int argc, char *argv[])
 {
        uint8_t nb_ports = 1;
        int rc = 0;
+       char *slash;
 
        /* Initialize GoogleTest&Mock and parse any args */
        testing::InitGoogleMock(&argc, argv);
@@ -44,6 +46,13 @@ main(int argc, char *argv[])
        argc -= ret;
        argv += ret;
 
+       /* get the path of binary and save in a global variable to be used later*/
+       realpath(argv[0], binpath);
+       slash = NULL;
+       slash = strrchr(binpath, '/');
+       if (strcmp(binpath, "") != 0 && slash != NULL)
+               binpath[slash - binpath] = 0;
+
        /*
         * Creates a new mempool in memory to hold the mbufs.
         * Multiplied by 2 because of mempeool to be used for packet

diff --git a/test/gtest/test_common.h b/test/gtest/test_common.h
index 2eb93e4..a7fa41a 100644 (file)
--- a/test/gtest/test_common.h
+++ b/test/gtest/test_common.h
@@ -45,6 +45,8 @@
 extern struct rte_mempool *mbuf_pool;
 extern struct rte_mempool *frag_mp;
 
+extern char binpath[PATH_MAX];
+
 int port_init(uint8_t port, struct rte_mempool *mbuf_pool);
 
 uint64_t

diff --git a/test/gtest/test_tle_udp_stream_gen.h b/test/gtest/test_tle_udp_stream_gen.h
index 294e37c..0f3d11b 100644 (file)
--- a/test/gtest/test_tle_udp_stream_gen.h
+++ b/test/gtest/test_tle_udp_stream_gen.h
@@ -345,7 +345,7 @@ test_tle_udp_gen_base::prepare_pcaps(string l_ip, string r_ip, int l_port,
        string py_cmd;
 
        /* generate pcap rx & tx files * for tests using scapy */
-       py_cmd = "python ./test/gtest/test_scapy_gen.py ";
+       py_cmd = "python " + string(binpath) + "/test_scapy_gen.py ";
        py_cmd = py_cmd + " " + l_ip + " " + r_ip + " " +
                        to_string(l_port) + " " + to_string(r_port) + " " +
                        to_string(nb_pkts);
@@ -356,7 +356,6 @@ test_tle_udp_gen_base::prepare_pcaps(string l_ip, string r_ip, int l_port,
                py_cmd = py_cmd + " -bc4 " + to_string(l4_chksum);
        py_cmd = py_cmd + " " + rx_pcap_dest;
        system(py_cmd.c_str());
-
        return 0;
 }