Add 4 more test scripts for Lua, and its own testsuite menu

This adds test scripts for verifying Pinfo, Address, Field, FieldInfo, NSTime
and Listener classes/functions.  It also moves Lua test scripts out of
unittests and into its own new testsuite.

Change-Id: I65c238fd459efb96db3f8f9145842cd038dea7c7
Reviewed-on: https://code.wireshark.org/review/270
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

1 files changed, 0 insertions, 104 deletions

diff --git a/test/suite-unittests.sh b/test/suite-unittests.sh
index 6099b69be2..7883aa3104 100755
--- a/test/suite-unittests.sh
+++ b/test/suite-unittests.sh
@@ -69,105 +69,6 @@ unittests_step_exntest() {
 	unittests_step_test
 }
 
-unittests_step_lua_dissector_test() {
-	if [ $HAVE_LUA -ne 0 ]; then
-		test_step_skipped
-		return
-	fi
-
-	# First run tshark with the dissector script.
-	$TSHARK -r $CAPTURE_DIR/dns_port.pcap -V -X lua_script:$TESTS_DIR/lua/dissector.lua > testin.txt 2>&1
-	RETURNVALUE=$?
-	if [ ! $RETURNVALUE -eq $EXIT_OK ]; then
-		echo
-		cat ./testin_tmp.txt
-		test_step_failed "exit status of $DUT: $RETURNVALUE"
-		return
-	fi
-
-	# then run tshark again with the verification script. (it internally reads in testin.txt)
-	$TSHARK -r $CAPTURE_DIR/dns_port.pcap -X lua_script:$TESTS_DIR/lua/verify_dissector.lua > testout.txt 2>&1
-	if grep -q "All tests passed!" testout.txt; then
-		test_step_ok
-	else
-		echo
-		cat ./testin.txt
-		cat ./testout.txt
-		test_step_failed "didn't find pass marker"
-	fi
-}
-
-unittests_step_lua_int64_test() {
-	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
-		echo
-		cat ./testout.txt
-		test_step_failed "didn't find pass marker"
-	fi
-}
-
-unittests_step_lua_args_test() {
-	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/script_args.lua -X lua_script1:1 > testout.txt 2>&1
-	grep -q "All tests passed!" testout.txt
-	if [ $? -ne 0 ]; then
-		cat testout.txt
-		test_step_failed "lua_args_test test 1 failed"
-	fi
-	$TSHARK -r $CAPTURE_DIR/dhcp.pcap -X lua_script:$TESTS_DIR/lua/script_args.lua -X lua_script1:3 -X lua_script1:foo -X lua_script1:bar > testout.txt 2>&1
-	grep -q "All tests passed!" testout.txt
-	if [ $? -ne 0 ]; then
-		cat testout.txt
-		test_step_failed "lua_args_test test 2 failed"
-	fi
-	$TSHARK -r $CAPTURE_DIR/dhcp.pcap -X lua_script:$TESTS_DIR/lua/script_args.lua -X lua_script:$TESTS_DIR/lua/script_args.lua -X lua_script1:3 -X lua_script2:1 -X lua_script1:foo -X lua_script1:bar > testout.txt 2>&1
-	grep -q "All tests passed!" testout.txt
-	if [ $? -ne 0 ]; then
-		cat testout.txt
-		test_step_failed "lua_args_test test 3 failed"
-	fi
-	$TSHARK -r $CAPTURE_DIR/dhcp.pcap -X lua_script:$TESTS_DIR/lua/script_args.lua > testout.txt 2>&1
-	if grep -q "All tests passed!" testout.txt; then
-		cat testout.txt
-		test_step_failed "lua_args_test negative test 4 failed"
-	fi
-	$TSHARK -r $CAPTURE_DIR/dhcp.pcap -X lua_script:$TESTS_DIR/lua/script_args.lua -X lua_script1:3 > testout.txt 2>&1
-	if grep -q "All tests passed!" testout.txt; then
-		cat testout.txt
-		test_step_failed "lua_args_test negative test 5 failed"
-	fi
-	test_step_ok
-}
-
-unittests_step_lua_struct_test() {
-	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/struct.lua > testout.txt 2>&1
-	if grep -q "All tests passed!" testout.txt; then
-		test_step_ok
-	else
-		cat testout.txt
-		test_step_failed "didn't find pass marker"
-	fi
-}
-
 unittests_step_oids_test() {
 	DUT=$SOURCE_DIR/epan/oids_test
 	ARGS=
@@ -194,17 +95,12 @@ unittests_step_wmem_test() {
 
 unittests_cleanup_step() {
 	rm -f ./testout.txt
-	rm -f ./testin.txt
 }
 
 unittests_suite() {
 	test_step_set_pre unittests_cleanup_step
 	test_step_set_post unittests_cleanup_step
 	test_step_add "exntest" unittests_step_exntest
-	test_step_add "lua dissector" unittests_step_lua_dissector_test
-	test_step_add "lua int64" unittests_step_lua_int64_test
-	test_step_add "lua script arguments" unittests_step_lua_args_test
-	test_step_add "lua struct" unittests_step_lua_struct_test
 	test_step_add "oids_test" unittests_step_oids_test
 	test_step_add "reassemble_test" unittests_step_reassemble_test
 	test_step_add "tvbtest" unittests_step_tvbtest