aboutsummaryrefslogtreecommitdiffstats
path: root/test/suite-wslua.sh
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2015-11-26 13:33:33 -0800
committerGuy Harris <guy@alum.mit.edu>2015-11-26 21:34:24 +0000
commit0c6c08a60a686d17fee12bb5e56cc7a44ad70537 (patch)
treeb52356b0b235fdeb98e1430ad30f0cde8d27f775 /test/suite-wslua.sh
parent677faf2bd4bf233a7d8243b5c5abccf3111cfc5c (diff)
Change Lua tests to reflect the disappearance of WTAP_ENCAP_IEEE_802_11_AIROPEEK.
The old global tests don't work; get rid of them. Fix the values of the Lua globals in the new test, and get rid of IEEE_802_11_AIROPEEK. (Yes, if you have a Lua script that depends on IEEE_802_11_AIROPEEK being defined, or that depends on the values of the Wiretap encapsulations not changing, it breaks. Fix it.) Change-Id: I245c1c0c3ba1c450f7950c754624c51b5564848a Reviewed-on: https://code.wireshark.org/review/12210 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'test/suite-wslua.sh')
-rwxr-xr-xtest/suite-wslua.sh14
1 files changed, 1 insertions, 13 deletions
diff --git a/test/suite-wslua.sh b/test/suite-wslua.sh
index f523f47a58..b11e0d4cdf 100755
--- a/test/suite-wslua.sh
+++ b/test/suite-wslua.sh
@@ -396,24 +396,12 @@ wslua_step_globals_test() {
fi
# Tshark catches lua script failures, so we have to parse the output.
- $TSHARK -r $CAPTURE_DIR/empty.pcap -X lua_script:$TESTS_DIR/lua/verify_globals.lua -X lua_script1:$TESTS_DIR/lua/ -X lua_script1:$TESTS_DIR/lua/globals_1.8.txt > testout.txt 2>&1
+ $TSHARK -r $CAPTURE_DIR/empty.pcap -X lua_script:$TESTS_DIR/lua/verify_globals.lua -X lua_script1:$TESTS_DIR/lua/ -X lua_script1:$TESTS_DIR/lua/globals_2.2.txt > testout.txt 2>&1
grep -q "All tests passed!" testout.txt
if [ $? -ne 0 ]; then
cat testout.txt
test_step_failed "lua_globals_test test 1 failed"
fi
- $TSHARK -r $CAPTURE_DIR/empty.pcap -X lua_script:$TESTS_DIR/lua/verify_globals.lua -X lua_script1:$TESTS_DIR/lua/ -X lua_script1:$TESTS_DIR/lua/globals_1.10.txt > testout.txt 2>&1
- grep -q "All tests passed!" testout.txt
- if [ $? -ne 0 ]; then
- cat testout.txt
- test_step_failed "lua_globals_test test 2 failed"
- fi
- $TSHARK -r $CAPTURE_DIR/empty.pcap -X lua_script:$TESTS_DIR/lua/verify_globals.lua -X lua_script1:$TESTS_DIR/lua/ -X lua_script1:$TESTS_DIR/lua/globals_1.12.txt > testout.txt 2>&1
- grep -q "All tests passed!" testout.txt
- if [ $? -ne 0 ]; then
- cat testout.txt
- test_step_failed "lua_globals_test test 2 failed"
- fi
test_step_ok
}