Browse Source

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>
Johannes Berg 10 years ago
parent
commit
788dc17f8c
2 changed files with 2 additions and 2 deletions
  1. 1 1
      tests/hwsim/test_cfg80211.py
  2. 1 1
      tests/hwsim/test_p2p_channel.py

+ 1 - 1
tests/hwsim/test_cfg80211.py

@@ -85,7 +85,7 @@ def test_cfg80211_tx_frame(dev, apdev, params):
     try:
     try:
         arg = [ "tshark",
         arg = [ "tshark",
                 "-r", os.path.join(params['logdir'], "hwsim0.pcapng"),
                 "-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" ]
                 "-Tfields", "-e", "radiotap.channel.freq" ]
         cmd = subprocess.Popen(arg, stdout=subprocess.PIPE,
         cmd = subprocess.Popen(arg, stdout=subprocess.PIPE,
                                stderr=open('/dev/null', 'w'))
                                stderr=open('/dev/null', 'w'))

+ 1 - 1
tests/hwsim/test_p2p_channel.py

@@ -120,7 +120,7 @@ def test_p2p_channel_random_social_with_op_class_change(dev, apdev, params):
         try:
         try:
             arg = [ "tshark",
             arg = [ "tshark",
                     "-r", os.path.join(params['logdir'], "hwsim0.pcapng"),
                     "-r", os.path.join(params['logdir'], "hwsim0.pcapng"),
-                    "-R", "wifi_p2p.public_action.subtype == 0",
+                    "-Y", "wifi_p2p.public_action.subtype == 0",
                     "-V" ]
                     "-V" ]
             cmd = subprocess.Popen(arg, stdout=subprocess.PIPE,
             cmd = subprocess.Popen(arg, stdout=subprocess.PIPE,
                                    stderr=open('/dev/null', 'w'))
                                    stderr=open('/dev/null', 'w'))