diff options
| author | Guy Harris <guy@alum.mit.edu> | 2012-11-21 19:01:16 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2012-11-21 19:01:16 +0000 |
| commit | 7714813e0ea3d5b347fcf6e01caff6b67131b9d0 (patch) | |
| tree | d545bd7879d0488adb39b8c880318ecd2d0b1e84 /test/suite-clopts.sh | |
| parent | 6871a7bb1c0a6816ee6c9bbe3049ba681eb23658 (diff) | |
For invalid interfaces, just check for "The capture session could not be
initiated", as we used to do.
svn path=/trunk/; revision=46117
Diffstat (limited to 'test/suite-clopts.sh')
| -rwxr-xr-x | test/suite-clopts.sh | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/test/suite-clopts.sh b/test/suite-clopts.sh index deed671260..3b93386f0d 100755 --- a/test/suite-clopts.sh +++ b/test/suite-clopts.sh @@ -114,11 +114,7 @@ clopts_step_dumpcap_invalid_interfaces() { if [ ! $RETURNVALUE -eq $EXIT_COMMAND_LINE ]; then test_step_failed "exit status: $RETURNVALUE" else - if [ "$WS_SYSTEM" = "Windows" ] ; then - grep -i 'The capture session could not be initiated (Error opening adapter: The system cannot find the device specified. (20)).' ./testout.txt > /dev/null - else - grep -i "The capture session could not be initiated (You don't have permission to capture on that device)." ./testout.txt > /dev/null - fi + grep -i 'The capture session could not be initiated' ./testout.txt > /dev/null if [ $? -eq 0 ]; then test_step_output_print ./testout.txt test_step_ok @@ -237,11 +233,7 @@ clopts_step_tshark_invalid_interfaces() { if [ ! $RETURNVALUE -eq $EXIT_COMMAND_LINE ]; then test_step_failed "exit status: $RETURNVALUE" else - if [ "$WS_SYSTEM" = "Windows" ] ; then - grep -i 'The capture session could not be initiated (Error opening adapter: The system cannot find the device specified. (20)).' ./testout.txt > /dev/null - else - grep -i "The capture session could not be initiated (You don't have permission to capture on that device)." ./testout.txt > /dev/null - fi + grep -i 'The capture session could not be initiated' ./testout.txt > /dev/null if [ $? -eq 0 ]; then test_step_output_print ./testout.txt test_step_ok |