Added check script, moved all tests to subdir in win32

darcs-hash:20060215153153-65a35-e1e78bd3b0e71baaf74e6afca09d7a5edd916c53.gz

Added check script, moved all tests to subdir in win32
darcs-hash:20060215153153-65a35-e1e78bd3b0e71baaf74e6afca09d7a5edd916c53.gz
10321b43 · Pekka Pessi · 81244f1d · 10321b43 · 10321b43 · 10321b43
Commit 10321b43 authored Feb 15, 2006 by Pekka Pessi
19 changed files
--- a/win32/README.txt
+++ b/win32/README.txt
@@ -14,7 +14,9 @@ Source code and documentation for the pthread library can also be
 downloaded from http://sources.redhat.com/pthreads-win32/.

 The script autogen.cmd should be used to prepare source tree before
-compiling Sofia SIP.
+compiling Sofia SIP. Note that it uses the gawk utility - see
+http://unxutils.sourceforge.net.

 Currently, the SofiaSIP.dsw workspace creates a shared library for
-sofia-sip-ua and a few test programs.
+sofia-sip-ua and a few test programs. The tests programs can be run 
+with the script check.cmd.
--- a/win32/SofiaSIP.dsw
+++ b/win32/SofiaSIP.dsw
@@ -15,7 +15,7 @@ Package=<4>

 ###############################################################################

-Project: "nta_test"=".\nta_test\nta_test.dsp" - Package Owner=<4>
+Project: "test_nta"=".\tests\test_nta\test_nta.dsp" - Package Owner=<4>

 Package=<5>
 {{{
@@ -45,7 +45,7 @@ Package=<4>

 ###############################################################################

-Project: "su_alloc_test"=".\su\su_alloc_test\su_alloc_test.dsp" - Package Owner=<4>
+Project: "su_alloc_test"=".\tests\su_alloc_test\su_alloc_test.dsp" - Package Owner=<4>

 Package=<5>
 {{{
@@ -60,7 +60,7 @@ Package=<4>

 ###############################################################################

-Project: "su_root_test"=".\su\su_root_test\su_root_test.dsp" - Package Owner=<4>
+Project: "su_root_test"=".\tests\su_root_test\su_root_test.dsp" - Package Owner=<4>

 Package=<5>
 {{{
@@ -75,7 +75,7 @@ Package=<4>

 ###############################################################################

-Project: "su_tag_test"=".\su\su_tag_test\su_tag_test.dsp" - Package Owner=<4>
+Project: "su_tag_test"=".\tests\su_tag_test\su_tag_test.dsp" - Package Owner=<4>

 Package=<5>
 {{{
@@ -90,7 +90,7 @@ Package=<4>

 ###############################################################################

-Project: "su_test"=".\su\su_test\su_test.dsp" - Package Owner=<4>
+Project: "su_test"=".\tests\su_test\su_test.dsp" - Package Owner=<4>

 Package=<5>
 {{{
@@ -105,7 +105,7 @@ Package=<4>

 ###############################################################################

-Project: "su_time_test"=".\su\su_time_test\su_time_test.dsp" - Package Owner=<4>
+Project: "su_time_test"=".\tests\su_time_test\su_time_test.dsp" - Package Owner=<4>

 Package=<5>
 {{{
@@ -120,7 +120,7 @@ Package=<4>

 ###############################################################################

-Project: "su_timer_test"=".\su\su_timer_test\su_timer_test.dsp" - Package Owner=<4>
+Project: "su_timer_test"=".\tests\su_timer_test\su_timer_test.dsp" - Package Owner=<4>

 Package=<5>
 {{{
@@ -135,7 +135,7 @@ Package=<4>

 ###############################################################################

-Project: "su_torture"=".\su\su_torture\su_torture.dsp" - Package Owner=<4>
+Project: "su_torture"=".\tests\su_torture\su_torture.dsp" - Package Owner=<4>

 Package=<5>
 {{{
@@ -150,7 +150,7 @@ Package=<4>

 ###############################################################################

-Project: "test_memmem"=".\su\test_memmem\test_memmem.dsp" - Package Owner=<4>
+Project: "test_memmem"=".\tests\test_memmem\test_memmem.dsp" - Package Owner=<4>

 Package=<5>
 {{{
@@ -165,7 +165,7 @@ Package=<4>

 ###############################################################################

-Project: "torture_htable"=".\su\torture_htable\torture_htable.dsp" - Package Owner=<4>
+Project: "torture_htable"=".\tests\torture_htable\torture_htable.dsp" - Package Owner=<4>

 Package=<5>
 {{{
@@ -180,7 +180,7 @@ Package=<4>

 ###############################################################################

-Project: "torture_rbtree"=".\su\torture_rbtree\torture_rbtree.dsp" - Package Owner=<4>
+Project: "torture_rbtree"=".\tests\torture_rbtree\torture_rbtree.dsp" - Package Owner=<4>

 Package=<5>
 {{{
@@ -195,7 +195,7 @@ Package=<4>

 ###############################################################################

-Project: "torture_su_memmem"=".\su\torture_su_memmem\torture_su_memmem.dsp" - Package Owner=<4>
+Project: "torture_su_bm"=".\tests\torture_su_bm\torture_su_bm.dsp" - Package Owner=<4>

 Package=<5>
 {{{
@@ -210,7 +210,7 @@ Package=<4>

 ###############################################################################

-Project: "torture_su_port"=".\su\torture_su_port\torture_su_port.dsp" - Package Owner=<4>
+Project: "torture_su_port"=".\tests\torture_su_port\torture_su_port.dsp" - Package Owner=<4>

 Package=<5>
 {{{
@@ -236,4 +236,3 @@ Package=<3>
 }}}

 ###############################################################################
-
--- a/win32/autogen.cmd
+++ b/win32/autogen.cmd
@@ -5,7 +5,7 @@
 ::
 :: This file is part of the Sofia-SIP package
 ::
-:: Copyright (C) 2005 Nokia Corporation.
+:: Copyright (C) 2006 Nokia Corporation.
 ::
 :: Contact: Pekka Pessi <pekka.pessi@nokia.com>
 ::

--- a/win32/check.cmd
+++ b/win32/check.cmd
+:: Run test programs
+::
+:: This file is part of the Sofia-SIP package
+::
+:: Copyright (C) 2006 Nokia Corporation.
+::
+:: Contact: Pekka Pessi <pekka.pessi@nokia.com>
+::
+:: This library is free software; you can redistribute it and/or
+:: modify it under the terms of the GNU Lesser General Public License
+:: as published by the Free Software Foundation; either version 2.1 of
+:: the License, or (at your option) any later version.
+::
+:: This library is distributed in the hope that it will be useful, but
+:: WITHOUT ANY WARRANTY; without even the implied warranty of
+:: MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+:: Lesser General Public License for more details.
+::
+:: You should have received a copy of the GNU Lesser General Public
+:: License along with this library; if not, write to the Free Software
+:: Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+:: 02110-1301 USA
+::
+tests\su_alloc_test\Debug\su_alloc_test.exe
+@if errorlevel 1 ( echo su_alloc_test: FAIL ) else echo su_alloc_test: PASS
+
+tests\su_root_test\Debug\su_root_test.exe
+@if errorlevel 1 ( echo su_root_test: FAIL ) else echo su_root_test: PASS
+
+tests\su_tag_test\Debug\su_tag_test.exe
+@if errorlevel 1 ( echo su_tag_test: FAIL ) else echo su_tag_test: PASS
+
+tests\su_test\Debug\su_test.exe
+@if errorlevel 1 ( echo su_test: FAIL ) else echo su_test: PASS
+
+tests\su_time_test\Debug\su_time_test.exe
+@if errorlevel 1 ( echo su_time_test: FAIL ) else echo su_time_test: PASS
+
+tests\su_timer_test\Debug\su_timer_test.exe
+@if errorlevel 1 ( echo su_timer_test: FAIL ) else echo su_timer_test: PASS
+
+tests\su_torture\Debug\su_torture.exe
+@if errorlevel 1 ( echo su_torture: FAIL ) else echo su_torture: PASS
+
+tests\test_memmem\Debug\test_memmem.exe
+@if errorlevel 1 ( echo test_memmem: FAIL ) else echo test_memmem: PASS
+
+tests\test_nta\Debug\test_nta.exe
+@if errorlevel 1 ( echo test_nta: FAIL ) else echo test_nta: PASS
+
+tests\test_nua\Debug\test_nua.exe
+@if errorlevel 1 ( echo test_nua: FAIL ) else echo test_nua: PASS
+
+tests\torture_htable\Debug\torture_htable.exe
+@if errorlevel 1 ( echo torture_htable: FAIL ) else echo torture_htable: PASS
+
+tests\torture_rbtree\Debug\torture_rbtree.exe
+@if errorlevel 1 ( echo torture_rbtree: FAIL ) else echo torture_rbtree: PASS
+
+tests\torture_su_bm\Debug\torture_su_bm.exe
+@if errorlevel 1 ( echo torture_su_bm: FAIL ) else echo torture_su_bm: PASS
+
+tests\torture_su_port\Debug\torture_su_port.exe
+@if errorlevel 1 ( echo torture_su_port: FAIL ) else echo torture_su_port: PASS
--- a/win32/libsofia-sip-ua/libsofia_sip_ua.dsp
+++ b/win32/libsofia-sip-ua/libsofia_sip_ua.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I ".." /I "..\..\libsofia-sip-ua\su" /I "..\..\libsofia-sip-ua\ipt" /I "..\..\libsofia-sip-ua\sresolv" /I "..\..\libsofia-sip-ua\bnf" /I "..\..\libsofia-sip-ua\url" /I "..\..\libsofia-sip-ua\msg" /I "..\..\libsofia-sip-ua\sip" /I "..\..\libsofia-sip-ua\nta" /I "..\..\libsofia-sip-ua\nua" /I "..\..\libsofia-sip-ua\iptsec" /I "..\..\libsofia-sip-ua\http" /I "..\..\libsofia-sip-ua\nth" /I "..\..\libsofia-sip-ua\nea" /I "..\..\libsofia-sip-ua\sdp" /I "..\..\libsofia-sip-ua\soa" /I "..\..\libsofia-sip-ua\stun" /I "..\..\libsofia-sip-ua\tport" /I "..\..\libsofia-sip-ua\features" /I "..\pthread" /I "." /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "LIBSOFIA_SIP_UA_STATIC" /D "IN_LIBSOFIA_SIP_UA" /FR /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I ".." /I "..\..\libsofia-sip-ua\su" /I "..\..\libsofia-sip-ua\ipt" /I "..\..\libsofia-sip-ua\sresolv" /I "..\..\libsofia-sip-ua\bnf" /I "..\..\libsofia-sip-ua\url" /I "..\..\libsofia-sip-ua\msg" /I "..\..\libsofia-sip-ua\sip" /I "..\..\libsofia-sip-ua\nta" /I "..\..\libsofia-sip-ua\nua" /I "..\..\libsofia-sip-ua\iptsec" /I "..\..\libsofia-sip-ua\http" /I "..\..\libsofia-sip-ua\nth" /I "..\..\libsofia-sip-ua\nea" /I "..\..\libsofia-sip-ua\sdp" /I "..\..\libsofia-sip-ua\soa" /I "..\..\libsofia-sip-ua\stun" /I "..\..\libsofia-sip-ua\tport" /I "..\..\libsofia-sip-ua\features" /I "..\pthread" /I "." /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "IN_LIBSOFIA_SIP_UA" /FR /YX /FD /c
 # ADD BASE RSC /l 0x40b /d "NDEBUG"
 # ADD RSC /l 0x40b /d "NDEBUG"
 BSC32=bscmake.exe
@@ -64,7 +64,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "Debug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I ".." /I "..\..\libsofia-sip-ua\su" /I "..\..\libsofia-sip-ua\ipt" /I "..\..\libsofia-sip-ua\sresolv" /I "..\..\libsofia-sip-ua\bnf" /I "..\..\libsofia-sip-ua\url" /I "..\..\libsofia-sip-ua\msg" /I "..\..\libsofia-sip-ua\sip" /I "..\..\libsofia-sip-ua\nta" /I "..\..\libsofia-sip-ua\nua" /I "..\..\libsofia-sip-ua\iptsec" /I "..\..\libsofia-sip-ua\http" /I "..\..\libsofia-sip-ua\nth" /I "..\..\libsofia-sip-ua\nea" /I "..\..\libsofia-sip-ua\sdp" /I "..\..\libsofia-sip-ua\soa" /I "..\..\libsofia-sip-ua\stun" /I "..\..\libsofia-sip-ua\tport" /I "..\..\libsofia-sip-ua\features" /I "..\pthread" /I "." /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "LIBSOFIA_SIP_UA_STATIC" /D "IN_LIBSOFIA_SIP_UA" /FR /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I ".." /I "..\..\libsofia-sip-ua\su" /I "..\..\libsofia-sip-ua\ipt" /I "..\..\libsofia-sip-ua\sresolv" /I "..\..\libsofia-sip-ua\bnf" /I "..\..\libsofia-sip-ua\url" /I "..\..\libsofia-sip-ua\msg" /I "..\..\libsofia-sip-ua\sip" /I "..\..\libsofia-sip-ua\nta" /I "..\..\libsofia-sip-ua\nua" /I "..\..\libsofia-sip-ua\iptsec" /I "..\..\libsofia-sip-ua\http" /I "..\..\libsofia-sip-ua\nth" /I "..\..\libsofia-sip-ua\nea" /I "..\..\libsofia-sip-ua\sdp" /I "..\..\libsofia-sip-ua\soa" /I "..\..\libsofia-sip-ua\stun" /I "..\..\libsofia-sip-ua\tport" /I "..\..\libsofia-sip-ua\features" /I "..\pthread" /I "." /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "IN_LIBSOFIA_SIP_UA" /FR /YX /FD /GZ /c
 # ADD BASE RSC /l 0x40b /d "_DEBUG"
 # ADD RSC /l 0x40b /d "_DEBUG"
 BSC32=bscmake.exe

--- a/win32/nta_test/nta_test.dsp
+++ b/win32/nta_test/nta_test.dsp
-# Microsoft Developer Studio Project File - Name="nta_test" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=nta_test - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "nta_test.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "nta_test.mak" CFG="nta_test - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "nta_test - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "nta_test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "nta_test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I ".." /I "..\..\libsofia-sip-ua\su" /I "..\..\libsofia-sip-ua\ipt" /I "..\..\libsofia-sip-ua\sresolv" /I "..\..\libsofia-sip-ua\bnf" /I "..\..\libsofia-sip-ua\url" /I "..\..\libsofia-sip-ua\msg" /I "..\..\libsofia-sip-ua\sip" /I "..\..\libsofia-sip-ua\nta" /I "..\..\libsofia-sip-ua\nua" /I "..\..\libsofia-sip-ua\iptsec" /I "..\..\libsofia-sip-ua\http" /I "..\..\libsofia-sip-ua\nth" /I "..\..\libsofia-sip-ua\nea" /I "..\..\libsofia-sip-ua\sdp" /I "..\..\libsofia-sip-ua\soa" /I "..\..\libsofia-sip-ua\stun" /I "..\..\libsofia-sip-ua\tport" /I "include" /I "." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib ws2_32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "nta_test - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I ".." /I "..\..\libsofia-sip-ua\su" /I "..\..\libsofia-sip-ua\ipt" /I "..\..\libsofia-sip-ua\sresolv" /I "..\..\libsofia-sip-ua\bnf" /I "..\..\libsofia-sip-ua\url" /I "..\..\libsofia-sip-ua\msg" /I "..\..\libsofia-sip-ua\sip" /I "..\..\libsofia-sip-ua\nta" /I "..\..\libsofia-sip-ua\nua" /I "..\..\libsofia-sip-ua\iptsec" /I "..\..\libsofia-sip-ua\http" /I "..\..\libsofia-sip-ua\nth" /I "..\..\libsofia-sip-ua\nea" /I "..\..\libsofia-sip-ua\sdp" /I "..\..\libsofia-sip-ua\soa" /I "..\..\libsofia-sip-ua\stun" /I "..\..\libsofia-sip-ua\tport" /I "include" /I "." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "nta_test - Win32 Release"
-# Name "nta_test - Win32 Debug"
-# Begin Source File
-
-SOURCE="..\..\libsofia-sip-ua\nta\test_nta.c"
-# End Source File
-# Begin Source File
-
-SOURCE=..\pthread\pthreadVC2.lib
-# End Source File
-# End Target
-# End Project
--- a/win32/su/su_alloc_test/su_alloc_test.dsp
+++ b/win32/su/su_alloc_test/su_alloc_test.dsp
--- a/win32/su/su_root_test/su_root_test.dsp
+++ b/win32/su/su_root_test/su_root_test.dsp
--- a/win32/su/su_tag_test/su_tag_test.dsp
+++ b/win32/su/su_tag_test/su_tag_test.dsp
--- a/win32/su/su_test/su_test.dsp
+++ b/win32/su/su_test/su_test.dsp
--- a/win32/su/su_time_test/su_time_test.dsp
+++ b/win32/su/su_time_test/su_time_test.dsp
--- a/win32/su/su_timer_test/su_timer_test.dsp
+++ b/win32/su/su_timer_test/su_timer_test.dsp
--- a/win32/su/su_torture/su_torture.dsp
+++ b/win32/su/su_torture/su_torture.dsp
--- a/win32/su/test_memmem/test_memmem.dsp
+++ b/win32/su/test_memmem/test_memmem.dsp
--- a/win32/su/torture_su_memmem/torture_su_memmem.dsp
+++ b/win32/su/torture_su_memmem/torture_su_memmem.dsp
-# Microsoft Developer Studio Project File - Name="torture_su_memmem" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="test_nta" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

-CFG=torture_su_memmem - Win32 Debug
+CFG=test_nta - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
-!MESSAGE NMAKE /f "torture_su_memmem.mak".
+!MESSAGE NMAKE /f "test_nta.mak".
 !MESSAGE 
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "torture_su_memmem.mak" CFG="torture_su_memmem - Win32 Debug"
+!MESSAGE NMAKE /f "test_nta.mak" CFG="test_nta - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "torture_su_memmem - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "torture_su_memmem - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "test_nta - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "test_nta - Win32 Debug" (based on "Win32 (x86) Console Application")
 !MESSAGE 

 # Begin Project
@@ -28,7 +28,7 @@ CFG=torture_su_memmem - Win32 Debug
 CPP=cl.exe
 RSC=rc.exe

-!IF  "$(CFG)" == "torture_su_memmem - Win32 Release"
+!IF  "$(CFG)" == "test_nta - Win32 Release"

 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -42,9 +42,9 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\.." /I "..\..\..\libsofia-sip-ua\su" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c
-# ADD BASE RSC /l 0x40b /d "NDEBUG"
-# ADD RSC /l 0x40b /d "NDEBUG"
+# ADD CPP /nologo /W3 /GX /O2 /I "..\.." /I "..\..\..\libsofia-sip-ua\su" /I "..\..\..\libsofia-sip-ua\ipt" /I "..\..\..\libsofia-sip-ua\sresolv" /I "..\..\..\libsofia-sip-ua\bnf" /I "..\..\..\libsofia-sip-ua\url" /I "..\..\..\libsofia-sip-ua\msg" /I "..\..\..\libsofia-sip-ua\sip" /I "..\..\..\libsofia-sip-ua\nta" /I "..\..\..\libsofia-sip-ua\nua" /I "..\..\..\libsofia-sip-ua\iptsec" /I "..\..\..\libsofia-sip-ua\http" /I "..\..\..\libsofia-sip-ua\nth" /I "..\..\..\libsofia-sip-ua\nea" /I "..\..\..\libsofia-sip-ua\sdp" /I "..\..\..\libsofia-sip-ua\soa" /I "..\..\..\libsofia-sip-ua\stun" /I "..\..\..\libsofia-sip-ua\tport" /I "..\..\..\libsofia-sip-ua\features" /I "include" /I "." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -52,7 +52,7 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
 # ADD LINK32 kernel32.lib user32.lib ws2_32.lib /nologo /subsystem:console /machine:I386

-!ELSEIF  "$(CFG)" == "torture_su_memmem - Win32 Debug"
+!ELSEIF  "$(CFG)" == "test_nta - Win32 Debug"

 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -66,9 +66,9 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\..\libsofia-sip-ua\su" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c
-# ADD BASE RSC /l 0x40b /d "_DEBUG"
-# ADD RSC /l 0x40b /d "_DEBUG"
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\..\libsofia-sip-ua\su" /I "..\..\..\libsofia-sip-ua\ipt" /I "..\..\..\libsofia-sip-ua\sresolv" /I "..\..\..\libsofia-sip-ua\bnf" /I "..\..\..\libsofia-sip-ua\url" /I "..\..\..\libsofia-sip-ua\msg" /I "..\..\..\libsofia-sip-ua\sip" /I "..\..\..\libsofia-sip-ua\nta" /I "..\..\..\libsofia-sip-ua\nua" /I "..\..\..\libsofia-sip-ua\iptsec" /I "..\..\..\libsofia-sip-ua\http" /I "..\..\..\libsofia-sip-ua\nth" /I "..\..\..\libsofia-sip-ua\nea" /I "..\..\..\libsofia-sip-ua\sdp" /I "..\..\..\libsofia-sip-ua\soa" /I "..\..\..\libsofia-sip-ua\stun" /I "..\..\..\libsofia-sip-ua\tport" /I "..\..\..\libsofia-sip-ua\features" /I "include" /I "." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -80,11 +80,11 @@ LINK32=link.exe

 # Begin Target

-# Name "torture_su_memmem - Win32 Release"
-# Name "torture_su_memmem - Win32 Debug"
+# Name "test_nta - Win32 Release"
+# Name "test_nta - Win32 Debug"
 # Begin Source File

-SOURCE="..\..\..\libsofia-sip-ua\su\torture_su_memmem.c"
+SOURCE="..\..\..\libsofia-sip-ua\nta\test_nta.c"
 # End Source File
 # Begin Source File


--- a/win32/su/torture_htable/torture_htable.dsp
+++ b/win32/su/torture_htable/torture_htable.dsp
--- a/win32/su/torture_rbtree/torture_rbtree.dsp
+++ b/win32/su/torture_rbtree/torture_rbtree.dsp
--- a/win32/tests/torture_su_bm/torture_su_bm.dsp
+++ b/win32/tests/torture_su_bm/torture_su_bm.dsp
+# Microsoft Developer Studio Project File - Name="torture_su_bm" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=torture_su_bm - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "torture_su_bm.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "torture_su_bm.mak" CFG="torture_su_bm - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "torture_su_bm - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "torture_su_bm - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "torture_su_bm - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\.." /I "..\..\..\libsofia-sip-ua\su" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c
+# ADD BASE RSC /l 0x40b /d "NDEBUG"
+# ADD RSC /l 0x40b /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib ws2_32.lib /nologo /subsystem:console /machine:I386
+
+!ELSEIF  "$(CFG)" == "torture_su_bm - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\..\libsofia-sip-ua\su" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c
+# ADD BASE RSC /l 0x40b /d "_DEBUG"
+# ADD RSC /l 0x40b /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "torture_su_bm - Win32 Release"
+# Name "torture_su_bm - Win32 Debug"
+# Begin Source File
+
+SOURCE="..\..\..\libsofia-sip-ua\su\torture_su_bm.c"
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\pthread\pthreadVC2.lib
+# End Source File
+# End Target
+# End Project
--- a/win32/su/torture_su_port/torture_su_port.dsp
+++ b/win32/su/torture_su_port/torture_su_port.dsp