diff options
| author | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-04-24 03:43:08 +0000 |
|---|---|---|
| committer | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-04-24 03:43:08 +0000 |
| commit | c4339b462c7fd21977711cfd8546c24b76b61ca1 (patch) | |
| tree | 78095e6cba2232f366f98c8791e42c0c5e55946a /test/suite-unittests.sh | |
| parent | e5f2ffe4e39d1bd722f856115e63a9e8cb114d24 (diff) | |
Addt'l fixes so suite-unittests will run under windows
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@21546 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'test/suite-unittests.sh')
| -rwxr-xr-x | test/suite-unittests.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/test/suite-unittests.sh b/test/suite-unittests.sh index c4eff935a9..8db12cadcd 100755 --- a/test/suite-unittests.sh +++ b/test/suite-unittests.sh @@ -37,17 +37,18 @@ unittests_step_test() { return fi - # if we're on windows, we have to copy the test exe, and its manifest, to the gtk2 + # if we're on windows, we have to copy the test exe, and its manifest, to the wireshark-gtk2 # dir before we can use them. + # {Note that 'INSTALL_DIR' must be a Windows Pathname) if [ "$WS_SYSTEM" == "Windows" ] ; then - (cd `dirname $DUT` && $MAKE `basename $DUT`_install INSTALL_DIR=`pwd`/../wireshark-gtk2) > testout.txt 2>&1 + (cd `dirname $DUT` && $MAKE `basename $DUT`_install INSTALL_DIR='..\wireshark-gtk2') > testout.txt 2>&1 if [ $? -ne 0 ]; then echo cat ./testout.txt test_step_failed "install $DUT failed" return fi - DUT=`pwd`/../wireshark-gtk2/`basename $DUT` + DUT=../wireshark-gtk2/`basename $DUT` fi $DUT > testout.txt 2>&1 |