diff options
| author | Graham Bloice <graham.bloice@trihedral.com> | 2015-01-02 13:12:17 +0000 |
|---|---|---|
| committer | Hadriel Kaplan <hadrielk@yahoo.com> | 2015-01-02 16:49:40 +0000 |
| commit | e7d0cdc061ade9e324fc02be61a36b0c6f52874f (patch) | |
| tree | 1d047b7cc0a30c7ac63c875cf4f387bb4ee0b6de /test | |
| parent | a3c705af067e93be65572d9ecabe73d3be55a6a5 (diff) | |
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>
Diffstat (limited to 'test')
| -rwxr-xr-x | test/suite-unittests.sh | 2 | ||||
| -rwxr-xr-x | test/test.sh | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/test/suite-unittests.sh b/test/suite-unittests.sh index 83c44bedc3..864f5a30b6 100755 --- a/test/suite-unittests.sh +++ b/test/suite-unittests.sh @@ -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##*/} diff --git a/test/test.sh b/test/test.sh index 1a542a5043..c7a2ac1d5c 100755 --- a/test/test.sh +++ b/test/test.sh @@ -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 |