tests: Use tshark -Y instead of tshark -R

Newer versions of tshark don't like the -R (read filter) argument
for filtering and just show a deprecation warning. Use -Y (display
filter) instead, which hopefully also works on older versions.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/tests/hwsim/test_cfg80211.py b/tests/hwsim/test_cfg80211.py
index 779c4f1..cc24b93 100644 (file)
--- a/tests/hwsim/test_cfg80211.py
+++ b/tests/hwsim/test_cfg80211.py
@@ -85,7 +85,7 @@ def test_cfg80211_tx_frame(dev, apdev, params):
     try:
         arg = [ "tshark",
                 "-r", os.path.join(params['logdir'], "hwsim0.pcapng"),
-                "-R", "wlan.fc.type_subtype == 13",
+                "-Y", "wlan.fc.type_subtype == 13",
                 "-Tfields", "-e", "radiotap.channel.freq" ]
         cmd = subprocess.Popen(arg, stdout=subprocess.PIPE,
                                stderr=open('/dev/null', 'w'))

diff --git a/tests/hwsim/test_p2p_channel.py b/tests/hwsim/test_p2p_channel.py
index 02c8fc2..40456cb 100644 (file)
--- a/tests/hwsim/test_p2p_channel.py
+++ b/tests/hwsim/test_p2p_channel.py
@@ -120,7 +120,7 @@ def test_p2p_channel_random_social_with_op_class_change(dev, apdev, params):
         try:
             arg = [ "tshark",
                     "-r", os.path.join(params['logdir'], "hwsim0.pcapng"),
-                    "-R", "wifi_p2p.public_action.subtype == 0",
+                    "-Y", "wifi_p2p.public_action.subtype == 0",
                     "-V" ]
             cmd = subprocess.Popen(arg, stdout=subprocess.PIPE,
                                    stderr=open('/dev/null', 'w'))