diff options
| author | Richard van der Hoff <richardv@mxtelecom.com> | 2007-04-18 22:31:47 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richardv@mxtelecom.com> | 2007-04-18 22:31:47 +0000 |
| commit | 674306a87de650e35ba1b077c1c3c1ad01389596 (patch) | |
| tree | 8143677cccddf309038bfad61d2a03729dc7a239 /test | |
| parent | e7e9a81155e869f8e46483749fed1d87a7a84d90 (diff) | |
| download | wireshark-674306a87de650e35ba1b077c1c3c1ad01389596.tar.gz wireshark-674306a87de650e35ba1b077c1c3c1ad01389596.tar.bz2 wireshark-674306a87de650e35ba1b077c1c3c1ad01389596.zip | |
following advice from Gerald, Graham Bloice, and others, let's try copying the unit test executables into the wireshark-gtk2 directory before running them.
svn path=/trunk/; revision=21472
Diffstat (limited to 'test')
| -rwxr-xr-x | test/suite-unittests.sh | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/test/suite-unittests.sh b/test/suite-unittests.sh index 901eebb711..844dcf2ad1 100755 --- a/test/suite-unittests.sh +++ b/test/suite-unittests.sh @@ -37,6 +37,19 @@ unittests_step_test() { return fi + # if we're on windows, we have to copy the test exe, and its manifest, to the gtk2 + # dir before we can use them. + if [ "$WS_SYSTEM" == "Windows" ] ; then + (cd `dirname $DUT` && $MAKE install_`basename $DUT` INSTALL_DIR=`pwd`/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` + fi + $DUT > testout.txt 2>&1 RETURNVALUE=$? if [ ! $RETURNVALUE -eq $EXIT_OK ]; then @@ -71,7 +84,7 @@ unittests_cleanup_step() { unittests_suite() { test_step_set_pre unittests_cleanup_step test_step_set_post unittests_cleanup_step - #test_step_add "exntest" unittests_step_exntest + test_step_add "exntest" unittests_step_exntest test_step_add "reassemble_test" unittests_step_reassemble_test test_step_add "tvbtest" unittests_step_tvbtest } |