diff options
| author | Evan Huus <eapache@gmail.com> | 2014-02-03 19:56:49 -0500 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2014-02-04 00:59:07 +0000 |
| commit | 1cd78285270dace76023d8a7e0d5694ce964f0b4 (patch) | |
| tree | 617640c41e2374bf330ddf0a88e1417019544de9 /test/suite-unittests.sh | |
| parent | 2e7f771a182df815e8c3d38986a1df0c77d7e4aa (diff) | |
| download | wireshark-1cd78285270dace76023d8a7e0d5694ce964f0b4.tar.gz | |
Various fixes to the Lua int64 code
- add casts to pacify certain buildbots
- skip test if lua isn't available
Change-Id: I614c05dca40cb848c87b361e4b3d3c4e94aafb9e
Reviewed-on: https://code.wireshark.org/review/97
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'test/suite-unittests.sh')
| -rwxr-xr-x | test/suite-unittests.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/test/suite-unittests.sh b/test/suite-unittests.sh index f10c65a00a..f9e0c68561 100755 --- a/test/suite-unittests.sh +++ b/test/suite-unittests.sh @@ -70,8 +70,13 @@ unittests_step_exntest() { } unittests_step_lua_int64_test() { - $TSHARK -r $CAPTURE_DIR/dhcp.pcap -X lua_script:$TESTS_DIR/lua/int64.lua > testout.txt 2>&1 + if [ $HAVE_LUA -ne 0 ]; then + test_step_skipped + return + fi + # Tshark catches lua script failures, so we have to parse the output. + $TSHARK -r $CAPTURE_DIR/dhcp.pcap -X lua_script:$TESTS_DIR/lua/int64.lua > testout.txt 2>&1 if grep -q "All tests passed!" testout.txt; then test_step_ok else |