diff options
| author | Bill Meier <wmeier@newsguy.com> | 2007-04-24 03:43:08 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2007-04-24 03:43:08 +0000 |
| commit | 6386eda24cc3c74dd869c39a81148ed339efbef3 (patch) | |
| tree | 78095e6cba2232f366f98c8791e42c0c5e55946a /test | |
| parent | 2c346d9a3ca3af8102aeeedb5e0f7668f884d6e7 (diff) | |
| download | wireshark-6386eda24cc3c74dd869c39a81148ed339efbef3.tar.gz wireshark-6386eda24cc3c74dd869c39a81148ed339efbef3.tar.bz2 wireshark-6386eda24cc3c74dd869c39a81148ed339efbef3.zip | |
Addt'l fixes so suite-unittests will run under windows
svn path=/trunk/; revision=21546
Diffstat (limited to 'test')
| -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 |