Merge branch 'rpc_intg1' of csi-sceasr-b45:/auto/proj-pcube-b/apps/PL-b/tools/repo//trex-core into rpc_intg1

9 files changed, 8 insertions, 5 deletions

diff --git a/scripts/automation/trex_control_plane/client/trex_async_client.py b/scripts/automation/trex_control_plane/client/trex_async_client.py
index 72cce5aa..d13513bf 100644
--- a/scripts/automation/trex_control_plane/client/trex_async_client.py
+++ b/scripts/automation/trex_control_plane/client/trex_async_client.py
@@ -181,7 +181,8 @@ class CTRexAsyncClient():
         self.socket.setsockopt(zmq.SUBSCRIBE, '')
 
         while self.active:
-            msg = json.loads(self.socket.recv_string())
+            line = self.socket.recv_string();
+            msg = json.loads(line)
 
             key = msg['name']
             self.raw_snapshot[key] = msg['data']
diff --git a/scripts/automation/trex_control_plane/console/trex_console.py b/scripts/automation/trex_control_plane/console/trex_console.py
index bd79479d..7931dfc9 100755
--- a/scripts/automation/trex_control_plane/console/trex_console.py
+++ b/scripts/automation/trex_control_plane/console/trex_console.py
@@ -380,12 +380,12 @@ def setParserOptions():
                         default = "localhost",
                         type = str)
 
-    parser.add_argument("-p", "--port", help = "TRex Server Port  [default is 5505]\n",
-                        default = 5505,
+    parser.add_argument("-p", "--port", help = "TRex Server Port  [default is 4501]\n",
+                        default = 4501,
                         type = int)
 
-    parser.add_argument("--async_port", help = "TRex ASync Publisher Port [default is 4505]\n",
-                        default = 4505,
+    parser.add_argument("--async_port", help = "TRex ASync Publisher Port [default is 4500]\n",
+                        default = 4500,
                         dest='pub',
                         type = int)
 
diff --git a/scripts/exp/stl_multi_burst1-0-ex.erf b/scripts/exp/stl_multi_burst1-0-ex.erf
new file mode 100644
index 00000000..c5cc7484
--- /dev/null
+++ b/scripts/exp/stl_multi_burst1-0-ex.erf
diff --git a/scripts/exp/stl_multi_pkt1-0-ex.erf b/scripts/exp/stl_multi_pkt1-0-ex.erf
new file mode 100644
index 00000000..de109191
--- /dev/null
+++ b/scripts/exp/stl_multi_pkt1-0-ex.erf
diff --git a/scripts/exp/stl_multi_pkt2-0-ex.erf b/scripts/exp/stl_multi_pkt2-0-ex.erf
new file mode 100644
index 00000000..eec33117
--- /dev/null
+++ b/scripts/exp/stl_multi_pkt2-0-ex.erf
diff --git a/scripts/exp/stl_single_pkt_burst1-0-ex.erf b/scripts/exp/stl_single_pkt_burst1-0-ex.erf
new file mode 100644
index 00000000..08afdf4b
--- /dev/null
+++ b/scripts/exp/stl_single_pkt_burst1-0-ex.erf
diff --git a/scripts/exp/stl_single_sctp_pkt-0-ex.erf b/scripts/exp/stl_single_sctp_pkt-0-ex.erf
new file mode 100644
index 00000000..5b991b8f
--- /dev/null
+++ b/scripts/exp/stl_single_sctp_pkt-0-ex.erf
diff --git a/scripts/exp/stl_single_stream-0-ex.erf b/scripts/exp/stl_single_stream-0-ex.erf
new file mode 100644
index 00000000..92883717
--- /dev/null
+++ b/scripts/exp/stl_single_stream-0-ex.erf
diff --git a/scripts/run-gtest-clean b/scripts/run-gtest-clean
new file mode 100644
index 00000000..c3f6ef9c
--- /dev/null
+++ b/scripts/run-gtest-clean
@@ -0,0 +1,2 @@
+#! /bin/bash
+valgrind --leak-check=full --show-reachable=yes ./bp-sim-64 --ut --gtest_filter="basic_stl.*"