diff options
author | Richard van der Hoff <richardv@mxtelecom.com> | 2007-04-03 10:53:38 +0000 |
---|---|---|
committer | Richard van der Hoff <richardv@mxtelecom.com> | 2007-04-03 10:53:38 +0000 |
commit | 2ab63b7719ff48a6bd95b80f3ed2f89ff205e04c (patch) | |
tree | cfaee4a4dc35e6a3b25a2a3d327d312c271bc537 /test | |
parent | 5d913e1701eeb4d415110e3bdd6205ef9e54602c (diff) | |
download | wireshark-2ab63b7719ff48a6bd95b80f3ed2f89ff205e04c.tar.gz wireshark-2ab63b7719ff48a6bd95b80f3ed2f89ff205e04c.tar.bz2 wireshark-2ab63b7719ff48a6bd95b80f3ed2f89ff205e04c.zip |
hopefully fix this for win32 by using nmake
svn path=/trunk/; revision=21312
Diffstat (limited to 'test')
-rwxr-xr-x | test/suite-unittests.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/test/suite-unittests.sh b/test/suite-unittests.sh index 81fc42e7aa..0fa24a1bce 100755 --- a/test/suite-unittests.sh +++ b/test/suite-unittests.sh @@ -22,8 +22,14 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # +if [ "$WS_SYSTEM" == "Windows" ] ; then + MAKE=nmake +else + MAKE=make +fi + unittests_step_test() { - make -C `dirname $DUT` `basename $DUT` >testout.txt 2>&1 + ( cd `dirname $DUT` && $MAKE `basename $DUT` ) >testout.txt 2>&1 if [ $? -ne 0 ]; then echo cat ./testout.txt |