osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Fix lua tests on Windows 

Convert TEST_DIR path to a Windows path, this is used in all the lua tests.
Fix a typo

Change-Id: I38808822c998ed1df007732b3701b6b13d6c886b
Reviewed-on: https://code.wireshark.org/review/6235
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
This commit is contained in:
Graham Bloice 2015-01-02 13:12:17 +00:00 committed by Hadriel Kaplan
parent a3c705af06
commit e7d0cdc061
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/suite-unittests.sh
View File

@ -64,7 +64,7 @@ set_dut() {
if [ "$SOURCE_DIR" = "$WS_BIN_PATH" -o "$WS_SYSTEM" = "Windows" ]; then
DUT=$SOURCE_DIR/epan/$1
else
# In out-of-tree builds, all bianries end up in the same folder
# In out-of-tree builds, all binaries end up in the same folder
# regardless of their path during in-tree builds, so we strip
# off any prefix part of the path (such as wmem/ for wmem_test)
DUT=$WS_BIN_PATH/${1##*/}

1
test/test.sh
View File

@ -90,6 +90,7 @@ if [ "$WS_SYSTEM" == "Windows" ] ; then
HOME_PATH="`cygpath -w $HOME_PATH`"
CONF_PATH="$HOME_PATH/Wireshark"
CAPTURE_DIR="`cygpath -w $CAPTURE_DIR`"
TESTS_DIR="`cygpath -w $TESTS_DIR`"
fi
mkdir -p $CONF_PATH