diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2014-04-06 22:01:03 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2014-04-07 05:54:19 +0000 |
| commit | cc3c05ed5f9e2d3eb8d72b3acc66bbacd50a26e7 (patch) | |
| tree | 620363df0e06e9485599eb8f4b2ea45a6319121f | |
| parent | e32b38164b237dc80478b49469e955f430c23f49 (diff) | |
| download | wireshark-cc3c05ed5f9e2d3eb8d72b3acc66bbacd50a26e7.tar.gz | |
Switch to Lua 5.2.3 built with MSVC2010 instead of the one built with MingW gcc 4.3
Fixes bug 9957
Change-Id: Ibe38ec25be5cfdad98c53c8257b0a858529897f6
Reviewed-on: https://code.wireshark.org/review/991
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
| -rw-r--r-- | config.nmake | 4 | ||||
| -rwxr-xr-x | test/suite-wslua.sh | 14 | ||||
| -rwxr-xr-x | tools/win32-setup.sh | 2 | ||||
| -rwxr-xr-x | tools/win64-setup.sh | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/config.nmake b/config.nmake index 40a1484c8e..847390331c 100644 --- a/config.nmake +++ b/config.nmake @@ -447,7 +447,7 @@ KFW_DIR=$(WIRESHARK_LIB_DIR)\kfw-3-2-2-i386-ws-vc6 # If you don't have LUA, comment this line out, so that LUA_DIR # isn't defined. # -LUA_DIST=-5.2.3_Win32_dllw4 +LUA_DIST=-5.2.3_Win32_dll10 LUA_DIR=$(WIRESHARK_LIB_DIR)\lua5.2.3 # @@ -694,7 +694,7 @@ GNUTLS_PKG=2.12.18-1.2-1 # If you don't have LUA, comment this line out, so that LUA_DIR # isn't defined. # -LUA_DIST=-5.2.3_Win64_dllw4 +LUA_DIST=-5.2.3_Win64_dll10 LUA_DIR=$(WIRESHARK_LIB_DIR)\lua5.2.3 # diff --git a/test/suite-wslua.sh b/test/suite-wslua.sh index a17af567cd..5afdc9a516 100755 --- a/test/suite-wslua.sh +++ b/test/suite-wslua.sh @@ -170,14 +170,14 @@ wslua_step_file_test() { fi # now compare testin and testout - they should be identical - # if diff -q ./testout.txt ./testin.txt; then + if diff -q ./testout.txt ./testin.txt; then test_step_ok - # else - # echo - # cat ./testout.txt - # diff ./testout.txt ./testin.txt - # test_step_failed "subtest-9 writing the acme sipmsg.log out as pcapng did not match sip.pcapng" - # fi + else + echo + cat ./testout.txt + diff ./testout.txt ./testin.txt + test_step_failed "subtest-9 writing the acme sipmsg.log out as pcapng did not match sip.pcapng" + fi } wslua_step_listener_test() { diff --git a/tools/win32-setup.sh b/tools/win32-setup.sh index fd47dfdaed..69b0f04b9d 100755 --- a/tools/win32-setup.sh +++ b/tools/win32-setup.sh @@ -22,7 +22,7 @@ # 32-bit wrapper for win-setup.sh. -export DOWNLOAD_TAG="2014-04-05" +export DOWNLOAD_TAG="2014-04-06" export WIRESHARK_TARGET_PLATFORM="win32" WIN_SETUP=`echo $0 | sed -e s/win32/win/` diff --git a/tools/win64-setup.sh b/tools/win64-setup.sh index 5691b79a7f..c866d1c976 100755 --- a/tools/win64-setup.sh +++ b/tools/win64-setup.sh @@ -22,7 +22,7 @@ # 64-bit wrapper for win-setup.sh. -export DOWNLOAD_TAG="2014-04-05" +export DOWNLOAD_TAG="2014-04-06" export WIRESHARK_TARGET_PLATFORM="win64" WIN_SETUP=`echo $0 | sed -e s/win64/win/` |