[dts] [PATCH] tests/tx_preparation: auto-detect tcpdump parameter format

[dts] [PATCH] tests/tx_preparation: auto-detect tcpdump parameter format

[Herbert Guan]

tcpdump is expect -P or -Q on different versions.
Use script to detect the expected option format automatically
to satisfy all versions of tcpdump.

Signed-off-by: Herbert Guan <herbert.guan@arm.com>
---
 tests/TestSuite_tx_preparation.py | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/tests/TestSuite_tx_preparation.py b/tests/TestSuite_tx_preparation.py
index b71f305..3c3080f 100644
--- a/tests/TestSuite_tx_preparation.py
+++ b/tests/TestSuite_tx_preparation.py
@@ -41,6 +41,8 @@ Test tx preparation feature
 import os
 import time
 import dut
+import re
+import subprocess
 from config import PortConf
 from test_case import TestCase
 from pmd_output import PmdOutput
@@ -97,9 +99,18 @@ class TestTX_preparation(TestCase):
 
     def start_tcpdump(self, rxItf):
 
+        param = ""
+        direct_param = r"(\s+)\[ -(\w) in\|out\|inout \]"
+        tcpdump_help = subprocess.check_output("tcpdump -h; echo 0",
+                                               stderr=subprocess.STDOUT,
+                                               shell=True)
+        for line in tcpdump_help.split('\n'):
+            m = re.match(direct_param, line)
+            if m:
+                param = "-" + m.group(2) + " in"
         self.tester.send_expect("rm -rf ./getPackageByTcpdump.cap", "#")
-        self.tester.send_expect("tcpdump -Q in -i %s -n -e -vv -w\
-            ./getPackageByTcpdump.cap 2> /dev/null& " % rxItf, "#")
+        self.tester.send_expect("tcpdump %s -i %s -n -e -vv -w\
+            ./getPackageByTcpdump.cap 2> /dev/null& " % (param,rxItf), "#")
 
     def get_tcpdump_package(self):
         self.tester.send_expect("killall tcpdump", "#")
-- 
1.8.3.1

Re: [dts] [PATCH] tests/tx_preparation: auto-detect tcpdump parameter format

[Liu, Yong]

Thanks Herbert. Applied.

On 08/04/2017 03:02 PM, Herbert Guan wrote:
> tcpdump is expect -P or -Q on different versions.
> Use script to detect the expected option format automatically
> to satisfy all versions of tcpdump.
>
> Signed-off-by: Herbert Guan<herbert.guan@arm.com>