]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
migrate t_atomic to lib/isc/tests/atomic_test
authorEvan Hunt <each@isc.org>
Tue, 27 Feb 2018 20:14:07 +0000 (12:14 -0800)
committerEvan Hunt <each@isc.org>
Sat, 10 Mar 2018 02:38:09 +0000 (18:38 -0800)
(cherry picked from commit 874e2fc70c75a969c63efad7c8e1a70e2bb5bae6)
(cherry picked from commit c7fa56e8db506ad6b0f7d19e5723908a0ecefac4)
(cherry picked from commit 492e19d6ec1f9e0788d54ce9d14455d7727161e0)

16 files changed:
bin/tests/.gitignore
bin/tests/Makefile.in
bin/tests/atomic/Makefile.in [deleted file]
bin/tests/atomic/win32/t_atomic.dsp.in [deleted file]
bin/tests/atomic/win32/t_atomic.dsw [deleted file]
bin/tests/atomic/win32/t_atomic.mak.in [deleted file]
bin/tests/atomic/win32/t_atomic.vcxproj.filters.in [deleted file]
bin/tests/atomic/win32/t_atomic.vcxproj.in [deleted file]
bin/tests/atomic/win32/t_atomic.vcxproj.user [deleted file]
configure
configure.in
lib/isc/tests/Makefile.in
lib/isc/tests/atomic_test.c [moved from bin/tests/atomic/t_atomic.c with 62% similarity]
util/copyrights
win32utils/Configure
win32utils/bind9.sln.in

index 8674eb66bb5edc0a16589b1befd34d7123021703..332a28d98725e9a021d51397ab74ce6b53011749 100644 (file)
@@ -4,7 +4,6 @@ headerdep_test.sh
 nxtify
 sdig
 *_test
-t_atomic
 t_db
 gsstest
 t_dst
index 10f6dd1d3d9bfa62d3c7b5c7c53e3d945110ba26..30a3ba117dc22a02b029010bb1d39045da1ae9ca 100644 (file)
@@ -40,8 +40,8 @@ ISCCFGDEPLIBS = ../../lib/isccfg/libisccfg.@A@
 
 LIBS =         @LIBS@
 
-SUBDIRS =      atomic db dst names rbt resolver \
-               tasks timers system @PKCS11_TOOLS@ optional
+SUBDIRS =      db dst names \
+               rbt resolver tasks timers system @PKCS11_TOOLS@ optional
 
 # Test programs that are built by default:
 # cfg_test is needed for regenerating doc/misc/options
diff --git a/bin/tests/atomic/Makefile.in b/bin/tests/atomic/Makefile.in
deleted file mode 100644 (file)
index c895329..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright (C) 2011, 2012, 2014  Internet Systems Consortium, Inc. ("ISC")
-#
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
-# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
-# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-# PERFORMANCE OF THIS SOFTWARE.
-
-# $Id: Makefile.in,v 1.2 2011/01/11 23:47:12 tbox Exp $
-
-srcdir =       @srcdir@
-VPATH =                @srcdir@
-top_srcdir =   @top_srcdir@
-
-@BIND9_MAKE_INCLUDES@
-
-CINCLUDES =    ${TEST_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES}
-
-CDEFINES =
-CWARNINGS =
-
-ISCLIBS =      ../../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@
-
-ISCDEPLIBS =   ../../../lib/isc/libisc.@A@
-
-DEPLIBS =      ${ISCDEPLIBS}
-
-LIBS =         ${ISCLIBS} @LIBS@
-
-TLIB =         ../../../lib/tests/libt_api.@A@
-
-TARGETS =      t_atomic@EXEEXT@
-
-SRCS =         t_atomic.c
-
-@BIND9_MAKE_RULES@
-
-t_atomic@EXEEXT@: t_atomic.@O@ ${DEPLIBS} ${TLIB}
-       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ t_atomic.@O@ ${TLIB} ${LIBS}
-
-test: t_atomic@EXEEXT@
-       -@./t_atomic@EXEEXT@ -c @top_srcdir@/t_config -b @srcdir@ -a
-
-testhelp:
-       @./t_atomic@EXEEXT@ -h
-
-clean distclean::
-       rm -f ${TARGETS}
diff --git a/bin/tests/atomic/win32/t_atomic.dsp.in b/bin/tests/atomic/win32/t_atomic.dsp.in
deleted file mode 100644 (file)
index 85b0a1e..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="t_atomic" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103
-
-CFG=t_atomic - @PLATFORM@ 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 "t_atomic.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 "t_atomic.mak" CFG="t_atomic - @PLATFORM@ Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "t_atomic - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
-!MESSAGE "t_atomic - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "t_atomic - @PLATFORM@ 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 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
-# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/tests/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @COPTY@ /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@
-# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/dns/win32/Release/libdns.lib ../../../../lib/tests/win32/Release/libtests.lib /nologo /subsystem:console @MACHINE@ /out:"../../../../Build/Release/t_atomic.exe"
-
-!ELSEIF  "$(CFG)" == "t_atomic - @PLATFORM@ 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 @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/tests/include" /I "../../../../lib/bind9/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR /FD /GZ /c
-# SUBTRACT CPP /X @COPTY@
-# 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@ /pdbtype:sept
-# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/dns/win32/Debug/libdns.lib ../../../../lib/tests/win32/Debug/libtests.lib /nologo /subsystem:console /map /debug @MACHINE@ /out:"../../../../Build/Debug/t_atomic.exe" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "t_atomic - @PLATFORM@ Release"
-# Name "t_atomic - @PLATFORM@ Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\t_atomic.c
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/bin/tests/atomic/win32/t_atomic.dsw b/bin/tests/atomic/win32/t_atomic.dsw
deleted file mode 100644 (file)
index 132da3d..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "t_atomic"=".\t_atomic.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/bin/tests/atomic/win32/t_atomic.mak.in b/bin/tests/atomic/win32/t_atomic.mak.in
deleted file mode 100644 (file)
index 1f9fa64..0000000
+++ /dev/null
@@ -1,375 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on t_atomic.dsp
-!IF "$(CFG)" == ""
-CFG=t_atomic - @PLATFORM@ Debug
-!MESSAGE No configuration specified. Defaulting to t_atomic - @PLATFORM@ Debug.
-!ENDIF 
-
-!IF "$(CFG)" != "t_atomic - @PLATFORM@ Release" && "$(CFG)" != "t_atomic - @PLATFORM@ Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!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 "t_atomic.mak" CFG="t_atomic - @PLATFORM@ Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "t_atomic - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
-!MESSAGE "t_atomic - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-CPP=cl.exe
-RSC=rc.exe
-LIBXML=@LIBXML2_LIB@
-
-!IF  "$(CFG)" == "t_atomic - @PLATFORM@ Release"
-_VC_MANIFEST_INC=0
-_VC_MANIFEST_BASENAME=__VC80
-!ELSE
-_VC_MANIFEST_INC=1
-_VC_MANIFEST_BASENAME=__VC80.Debug
-!ENDIF
-
-####################################################
-# Specifying name of temporary resource file used only in incremental builds:
-
-!if "$(_VC_MANIFEST_INC)" == "1"
-_VC_MANIFEST_AUTO_RES=$(_VC_MANIFEST_BASENAME).auto.res
-!else
-_VC_MANIFEST_AUTO_RES=
-!endif
-
-####################################################
-# _VC_MANIFEST_EMBED_EXE - command to embed manifest in EXE:
-
-!if "$(_VC_MANIFEST_INC)" == "1"
-
-#MT_SPECIAL_RETURN=1090650113
-#MT_SPECIAL_SWITCH=-notify_resource_update
-MT_SPECIAL_RETURN=0
-MT_SPECIAL_SWITCH=
-_VC_MANIFEST_EMBED_EXE= \
-if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \
-if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \
-rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \
-link $** /out:$@ $(LFLAGS)
-
-!else
-
-_VC_MANIFEST_EMBED_EXE= \
-if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;1
-
-!endif
-
-####################################################
-# _VC_MANIFEST_EMBED_DLL - command to embed manifest in DLL:
-
-!if "$(_VC_MANIFEST_INC)" == "1"
-
-#MT_SPECIAL_RETURN=1090650113
-#MT_SPECIAL_SWITCH=-notify_resource_update
-MT_SPECIAL_RETURN=0
-MT_SPECIAL_SWITCH=
-_VC_MANIFEST_EMBED_EXE= \
-if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \
-if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \
-rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \
-link $** /out:$@ $(LFLAGS)
-
-!else
-
-_VC_MANIFEST_EMBED_EXE= \
-if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2
-
-!endif
-####################################################
-# _VC_MANIFEST_CLEAN - command to clean resources files generated temporarily:
-
-!if "$(_VC_MANIFEST_INC)" == "1"
-
-_VC_MANIFEST_CLEAN=-del $(_VC_MANIFEST_BASENAME).auto.res \
-    $(_VC_MANIFEST_BASENAME).auto.rc \
-    $(_VC_MANIFEST_BASENAME).auto.manifest
-
-!else
-
-_VC_MANIFEST_CLEAN=
-
-!endif
-
-!IF  "$(CFG)" == "t_atomic - @PLATFORM@ Release"
-
-OUTDIR=.\Release
-INTDIR=.\Release
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "..\..\..\..\Build\Release\t_atomic.exe"
-
-!ELSE 
-
-ALL : "libtests - @PLATFORM@ Release" "libisc - @PLATFORM@ Release" "libdns - @PLATFORM@ Release" "..\..\..\..\Build\Release\t_atomic.exe"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libdns - @PLATFORM@ ReleaseCLEAN" "libisc - @PLATFORM@ ReleaseCLEAN" "libtests - @PLATFORM@ ReleaseCLEAN"
-!ELSE 
-CLEAN :
-!ENDIF 
-       -@erase "$(INTDIR)\t_atomic.obj"
-       -@erase "$(INTDIR)\vc60.idb"
-       -@erase "..\..\..\..\Build\Release\t_atomic.exe"
-       -@$(_VC_MANIFEST_CLEAN)
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/tests/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\t_atomic.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\t_atomic.bsc" 
-BSC32_SBRS= \
-       
-LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/dns/win32/Release/libdns.lib ../../../../lib/tests/win32/Release/libtests.lib $(LIBXML) /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\t_atomic.pdb" @MACHINE@ /out:"../../../../Build/Release/t_atomic.exe" 
-LINK32_OBJS= \
-       "$(INTDIR)\t_atomic.obj" \
-       "..\..\..\..\lib\dns\win32\Release\libdns.lib" \
-       "..\..\..\..\lib\isc\win32\Release\libisc.lib" \
-       "..\..\..\..\lib\tests\win32\Release\libtests.lib"
-
-"..\..\..\..\Build\Release\t_atomic.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-    $(_VC_MANIFEST_EMBED_EXE)
-
-!ELSEIF  "$(CFG)" == "t_atomic - @PLATFORM@ Debug"
-
-OUTDIR=.\Debug
-INTDIR=.\Debug
-# Begin Custom Macros
-OutDir=.\Debug
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "..\..\..\..\Build\Debug\t_atomic.exe" "$(OUTDIR)\t_atomic.bsc"
-
-!ELSE 
-
-ALL : "libtests - @PLATFORM@ Debug" "libisc - @PLATFORM@ Debug" "libdns - @PLATFORM@ Debug" "..\..\..\..\Build\Debug\t_atomic.exe" "$(OUTDIR)\t_atomic.bsc"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libdns - @PLATFORM@ DebugCLEAN" "libisc - @PLATFORM@ DebugCLEAN" "libtests - @PLATFORM@ DebugCLEAN"
-!ELSE 
-CLEAN :
-!ENDIF 
-       -@erase "$(INTDIR)\t_atomic.obj"
-       -@erase "$(INTDIR)\t_atomic.sbr"
-       -@erase "$(INTDIR)\vc60.idb"
-       -@erase "$(INTDIR)\vc60.pdb"
-       -@erase "$(OUTDIR)\t_atomic.bsc"
-       -@erase "$(OUTDIR)\t_atomic.map"
-       -@erase "$(OUTDIR)\t_atomic.pdb"
-       -@erase "..\..\..\..\Build\Debug\t_atomic.exe"
-       -@erase "..\..\..\..\Build\Debug\t_atomic.ilk"
-       -@$(_VC_MANIFEST_CLEAN)
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/tests/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\t_atomic.bsc" 
-BSC32_SBRS= \
-       "$(INTDIR)\t_atomic.sbr"
-
-"$(OUTDIR)\t_atomic.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
-    $(BSC32) @<<
-  $(BSC32_FLAGS) $(BSC32_SBRS)
-<<
-
-LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/dns/win32/Debug/libdns.lib ../../../../lib/tests/win32/Debug/libtests.lib $(LIBXML) /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\t_atomic.pdb" /map:"$(INTDIR)\t_atomic.map" /debug @MACHINE@ /out:"../../../../Build/Debug/t_atomic.exe" /pdbtype:sept 
-LINK32_OBJS= \
-       "$(INTDIR)\t_atomic.obj" \
-       "..\..\..\..\lib\dns\win32\Debug\libdns.lib" \
-       "..\..\..\..\lib\isc\win32\Debug\libisc.lib" \
-       "..\..\..\..\lib\tests\win32\Debug\libtests.lib"
-
-"..\..\..\..\Build\Debug\t_atomic.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-    $(_VC_MANIFEST_EMBED_EXE)
-
-!ENDIF 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("t_atomic.dep")
-!INCLUDE "t_atomic.dep"
-!ELSE 
-!MESSAGE Warning: cannot find "t_atomic.dep"
-!ENDIF 
-!ENDIF 
-
-
-!IF "$(CFG)" == "t_atomic - @PLATFORM@ Release" || "$(CFG)" == "t_atomic - @PLATFORM@ Debug"
-SOURCE=..\t_atomic.c
-
-!IF  "$(CFG)" == "t_atomic - @PLATFORM@ Release"
-
-
-"$(INTDIR)\t_atomic.obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "t_atomic - @PLATFORM@ Debug"
-
-
-"$(INTDIR)\t_atomic.obj"       "$(INTDIR)\t_atomic.sbr" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-!IF  "$(CFG)" == "t_atomic - @PLATFORM@ Release"
-
-"libdns - @PLATFORM@ Release" : 
-   cd "..\..\..\..\lib\dns\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" 
-   cd "..\..\..\bin\tests\atomic\win32"
-
-"libdns - @PLATFORM@ ReleaseCLEAN" : 
-   cd "..\..\..\..\lib\dns\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" RECURSE=1 CLEAN 
-   cd "..\..\..\bin\tests\atomic\win32"
-
-!ELSEIF  "$(CFG)" == "t_atomic - @PLATFORM@ Debug"
-
-"libdns - @PLATFORM@ Debug" : 
-   cd "..\..\..\..\lib\dns\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" 
-   cd "..\..\..\bin\tests\atomic\win32"
-
-"libdns - @PLATFORM@ DebugCLEAN" : 
-   cd "..\..\..\..\lib\dns\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" RECURSE=1 CLEAN 
-   cd "..\..\..\bin\tests\atomic\win32"
-
-!ENDIF 
-
-!IF  "$(CFG)" == "t_atomic - @PLATFORM@ Release"
-
-"libisc - @PLATFORM@ Release" : 
-   cd "..\..\..\..\lib\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" 
-   cd "..\..\..\bin\tests\atomic\win32"
-
-"libisc - @PLATFORM@ ReleaseCLEAN" : 
-   cd "..\..\..\..\lib\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN 
-   cd "..\..\..\bin\tests\atomic\win32"
-
-!ELSEIF  "$(CFG)" == "t_atomic - @PLATFORM@ Debug"
-
-"libisc - @PLATFORM@ Debug" : 
-   cd "..\..\..\..\lib\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" 
-   cd "..\..\..\bin\tests\atomic\win32"
-
-"libisc - @PLATFORM@ DebugCLEAN" : 
-   cd "..\..\..\..\lib\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN 
-   cd "..\..\..\bin\tests\atomic\win32"
-
-!ENDIF 
-
-!IF  "$(CFG)" == "t_atomic - @PLATFORM@ Release"
-
-"libtests - @PLATFORM@ Release" : 
-   cd "..\..\..\..\lib\tests\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Release" 
-   cd "..\..\..\bin\tests\atomic\win32"
-
-"libtests - @PLATFORM@ ReleaseCLEAN" : 
-   cd "..\..\..\..\lib\tests\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Release" RECURSE=1 CLEAN 
-   cd "..\..\..\bin\tests\atomic\win32"
-
-!ELSEIF  "$(CFG)" == "t_atomic - @PLATFORM@ Debug"
-
-"libtests - @PLATFORM@ Debug" : 
-   cd "..\..\..\..\lib\tests\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Debug" 
-   cd "..\..\..\bin\tests\atomic\win32"
-
-"libtests - @PLATFORM@ DebugCLEAN" : 
-   cd "..\..\..\..\lib\tests\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Debug" RECURSE=1 CLEAN 
-   cd "..\..\..\bin\tests\atomic\win32"
-
-!ENDIF 
-
-
-!ENDIF 
-
-####################################################
-# Commands to generate initial empty manifest file and the RC file
-# that references it, and for generating the .res file:
-
-$(_VC_MANIFEST_BASENAME).auto.res : $(_VC_MANIFEST_BASENAME).auto.rc
-
-$(_VC_MANIFEST_BASENAME).auto.rc : $(_VC_MANIFEST_BASENAME).auto.manifest
-    type <<$@
-#include <winuser.h>
-1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest"
-<< KEEP
-
-$(_VC_MANIFEST_BASENAME).auto.manifest :
-    type <<$@
-<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
-<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
-</assembly>
-<< KEEP
diff --git a/bin/tests/atomic/win32/t_atomic.vcxproj.filters.in b/bin/tests/atomic/win32/t_atomic.vcxproj.filters.in
deleted file mode 100644 (file)
index 41df97c..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\t_atomic.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/bin/tests/atomic/win32/t_atomic.vcxproj.in b/bin/tests/atomic/win32/t_atomic.vcxproj.in
deleted file mode 100644 (file)
index eed1870..0000000
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|@PLATFORM@">
-      <Configuration>Debug</Configuration>
-      <Platform>@PLATFORM@</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|@PLATFORM@">
-      <Configuration>Release</Configuration>
-      <Platform>@PLATFORM@</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{EC6ECB35-58C0-48EC-BAC9-9A652D9406C9}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>t_atomic</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\..\..\Build\$(Configuration)\</OutDir>
-    <IntDir>.\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\..\..\Build\$(Configuration)\</OutDir>
-    <IntDir>.\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <AdditionalIncludeDirectories>.\;..\..\..\..\;@LIBXML2_INC@..\..\..\..\lib\isc\win32;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;..\..\..\..\lib\dns\include;..\..\..\..\lib\tests\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OutputFile>..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalLibraryDirectories>..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\dns\win32\$(Configuration);..\..\..\..\lib\tests\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@LIBXML2_LIB@libisc.lib;libdns.lib;libtests.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-      <StringPooling>true</StringPooling>
-      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <AdditionalIncludeDirectories>.\;..\..\..\..\;@LIBXML2_INC@..\..\..\..\lib\isc\win32;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;..\..\..\..\lib\dns\include;..\..\..\..\lib\tests\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <OutputFile>..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
-      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
-      <AdditionalLibraryDirectories>..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\dns\win32\$(Configuration);..\..\..\..\lib\tests\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@LIBXML2_LIB@libisc.lib;libdns.lib;libtests.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\t_atomic.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/bin/tests/atomic/win32/t_atomic.vcxproj.user b/bin/tests/atomic/win32/t_atomic.vcxproj.user
deleted file mode 100644 (file)
index 695b5c7..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-</Project>
\ No newline at end of file
index b2209f13e2a911abc081b9f44a796c00f4d2bafa..4e8797b4d34d9ce5219e09c5e3916a9ea1814683 100755 (executable)
--- a/configure
+++ b/configure
@@ -23000,7 +23000,7 @@ ac_config_commands="$ac_config_commands chmod"
 # elsewhere if there's a good reason for doing so.
 #
 
-ac_config_files="$ac_config_files make/Makefile make/mkdep Makefile bin/Makefile bin/check/Makefile bin/confgen/Makefile bin/confgen/unix/Makefile bin/delv/Makefile bin/dig/Makefile bin/dnssec/Makefile bin/named/Makefile bin/named/unix/Makefile bin/nsupdate/Makefile bin/pkcs11/Makefile bin/python/Makefile bin/python/isc/Makefile bin/python/isc/utils.py bin/python/isc/tests/Makefile bin/python/dnssec-checkds.py bin/python/dnssec-coverage.py bin/python/isc/__init__.py bin/python/isc/checkds.py bin/python/isc/coverage.py bin/python/isc/dnskey.py bin/python/isc/eventlist.py bin/python/isc/keydict.py bin/python/isc/keyevent.py bin/python/isc/keyzone.py bin/python/isc/tests/dnskey_test.py bin/rndc/Makefile bin/tests/Makefile bin/tests/atomic/Makefile bin/tests/db/Makefile bin/tests/dst/Makefile bin/tests/dst/Kdh.+002+18602.key bin/tests/dst/Kdh.+002+18602.private bin/tests/dst/Kdh.+002+48957.key bin/tests/dst/Kdh.+002+48957.private bin/tests/dst/Ktest.+001+00002.key bin/tests/dst/Ktest.+001+54622.key bin/tests/dst/Ktest.+001+54622.private bin/tests/dst/Ktest.+003+23616.key bin/tests/dst/Ktest.+003+23616.private bin/tests/dst/Ktest.+003+49667.key bin/tests/dst/dst_2_data bin/tests/dst/t2_data_1 bin/tests/dst/t2_data_2 bin/tests/dst/t2_dsasig bin/tests/dst/t2_rsasig bin/tests/headerdep_test.sh bin/tests/names/Makefile bin/tests/optional/Makefile bin/tests/pkcs11/Makefile bin/tests/pkcs11/benchmarks/Makefile bin/tests/rbt/Makefile bin/tests/resolver/Makefile bin/tests/system/Makefile bin/tests/system/conf.sh bin/tests/system/dlz/prereq.sh bin/tests/system/dlzredir/prereq.sh bin/tests/system/dlzexternal/Makefile bin/tests/system/dlzexternal/ns1/dlzs.conf bin/tests/system/inline/checkdsa.sh bin/tests/system/lwresd/Makefile bin/tests/system/rsabigexponent/Makefile bin/tests/system/cookie/prereq.sh bin/tests/system/tkey/Makefile bin/tests/tasks/Makefile bin/tests/timers/Makefile bin/tests/virtual-time/Makefile bin/tests/virtual-time/conf.sh bin/tools/Makefile contrib/scripts/check-secure-delegation.pl contrib/scripts/zone-edit.sh doc/Makefile doc/arm/Makefile doc/arm/noteversion.xml doc/arm/pkgversion.xml doc/arm/releaseinfo.xml doc/doxygen/Doxyfile doc/doxygen/Makefile doc/doxygen/doxygen-input-filter doc/misc/Makefile doc/tex/Makefile doc/tex/armstyle.sty doc/xsl/Makefile doc/xsl/isc-docbook-chunk.xsl doc/xsl/isc-docbook-html.xsl doc/xsl/isc-manpage.xsl doc/xsl/isc-notes-html.xsl isc-config.sh lib/Makefile lib/bind9/Makefile lib/bind9/include/Makefile lib/bind9/include/bind9/Makefile lib/dns/Makefile lib/dns/include/Makefile lib/dns/include/dns/Makefile lib/dns/include/dst/Makefile lib/dns/tests/Makefile lib/irs/Makefile lib/irs/include/Makefile lib/irs/include/irs/Makefile lib/irs/include/irs/netdb.h lib/irs/include/irs/platform.h lib/irs/tests/Makefile lib/isc/$arch/Makefile lib/isc/$arch/include/Makefile lib/isc/$arch/include/isc/Makefile lib/isc/$thread_dir/Makefile lib/isc/$thread_dir/include/Makefile lib/isc/$thread_dir/include/isc/Makefile lib/isc/Makefile lib/isc/include/Makefile lib/isc/include/isc/Makefile lib/isc/include/isc/platform.h lib/isc/include/pk11/Makefile lib/isc/include/pkcs11/Makefile lib/isc/tests/Makefile lib/isc/nls/Makefile lib/isc/unix/Makefile lib/isc/unix/include/Makefile lib/isc/unix/include/isc/Makefile lib/isc/unix/include/pkcs11/Makefile lib/isccc/Makefile lib/isccc/include/Makefile lib/isccc/include/isccc/Makefile lib/isccfg/Makefile lib/isccfg/include/Makefile lib/isccfg/include/isccfg/Makefile lib/lwres/Makefile lib/lwres/include/Makefile lib/lwres/include/lwres/Makefile lib/lwres/include/lwres/netdb.h lib/lwres/include/lwres/platform.h lib/lwres/man/Makefile lib/lwres/tests/Makefile lib/lwres/unix/Makefile lib/lwres/unix/include/Makefile lib/lwres/unix/include/lwres/Makefile lib/tests/Makefile lib/tests/include/Makefile lib/tests/include/tests/Makefile lib/samples/Makefile lib/samples/Makefile-postinstall unit/Makefile unit/unittest.sh"
+ac_config_files="$ac_config_files make/Makefile make/mkdep Makefile bin/Makefile bin/check/Makefile bin/confgen/Makefile bin/confgen/unix/Makefile bin/delv/Makefile bin/dig/Makefile bin/dnssec/Makefile bin/named/Makefile bin/named/unix/Makefile bin/nsupdate/Makefile bin/pkcs11/Makefile bin/python/Makefile bin/python/isc/Makefile bin/python/isc/utils.py bin/python/isc/tests/Makefile bin/python/dnssec-checkds.py bin/python/dnssec-coverage.py bin/python/isc/__init__.py bin/python/isc/checkds.py bin/python/isc/coverage.py bin/python/isc/dnskey.py bin/python/isc/eventlist.py bin/python/isc/keydict.py bin/python/isc/keyevent.py bin/python/isc/keyzone.py bin/python/isc/tests/dnskey_test.py bin/rndc/Makefile bin/tests/Makefile bin/tests/db/Makefile bin/tests/dst/Makefile bin/tests/dst/Kdh.+002+18602.key bin/tests/dst/Kdh.+002+18602.private bin/tests/dst/Kdh.+002+48957.key bin/tests/dst/Kdh.+002+48957.private bin/tests/dst/Ktest.+001+00002.key bin/tests/dst/Ktest.+001+54622.key bin/tests/dst/Ktest.+001+54622.private bin/tests/dst/Ktest.+003+23616.key bin/tests/dst/Ktest.+003+23616.private bin/tests/dst/Ktest.+003+49667.key bin/tests/dst/dst_2_data bin/tests/dst/t2_data_1 bin/tests/dst/t2_data_2 bin/tests/dst/t2_dsasig bin/tests/dst/t2_rsasig bin/tests/headerdep_test.sh bin/tests/names/Makefile bin/tests/optional/Makefile bin/tests/pkcs11/Makefile bin/tests/pkcs11/benchmarks/Makefile bin/tests/rbt/Makefile bin/tests/resolver/Makefile bin/tests/system/Makefile bin/tests/system/conf.sh bin/tests/system/dlz/prereq.sh bin/tests/system/dlzredir/prereq.sh bin/tests/system/dlzexternal/Makefile bin/tests/system/dlzexternal/ns1/dlzs.conf bin/tests/system/inline/checkdsa.sh bin/tests/system/lwresd/Makefile bin/tests/system/rsabigexponent/Makefile bin/tests/system/cookie/prereq.sh bin/tests/system/tkey/Makefile bin/tests/tasks/Makefile bin/tests/timers/Makefile bin/tests/virtual-time/Makefile bin/tests/virtual-time/conf.sh bin/tools/Makefile contrib/scripts/check-secure-delegation.pl contrib/scripts/zone-edit.sh doc/Makefile doc/arm/Makefile doc/arm/noteversion.xml doc/arm/pkgversion.xml doc/arm/releaseinfo.xml doc/doxygen/Doxyfile doc/doxygen/Makefile doc/doxygen/doxygen-input-filter doc/misc/Makefile doc/tex/Makefile doc/tex/armstyle.sty doc/xsl/Makefile doc/xsl/isc-docbook-chunk.xsl doc/xsl/isc-docbook-html.xsl doc/xsl/isc-manpage.xsl doc/xsl/isc-notes-html.xsl isc-config.sh lib/Makefile lib/bind9/Makefile lib/bind9/include/Makefile lib/bind9/include/bind9/Makefile lib/dns/Makefile lib/dns/include/Makefile lib/dns/include/dns/Makefile lib/dns/include/dst/Makefile lib/dns/tests/Makefile lib/irs/Makefile lib/irs/include/Makefile lib/irs/include/irs/Makefile lib/irs/include/irs/netdb.h lib/irs/include/irs/platform.h lib/irs/tests/Makefile lib/isc/$arch/Makefile lib/isc/$arch/include/Makefile lib/isc/$arch/include/isc/Makefile lib/isc/$thread_dir/Makefile lib/isc/$thread_dir/include/Makefile lib/isc/$thread_dir/include/isc/Makefile lib/isc/Makefile lib/isc/include/Makefile lib/isc/include/isc/Makefile lib/isc/include/isc/platform.h lib/isc/include/pk11/Makefile lib/isc/include/pkcs11/Makefile lib/isc/tests/Makefile lib/isc/nls/Makefile lib/isc/unix/Makefile lib/isc/unix/include/Makefile lib/isc/unix/include/isc/Makefile lib/isc/unix/include/pkcs11/Makefile lib/isccc/Makefile lib/isccc/include/Makefile lib/isccc/include/isccc/Makefile lib/isccfg/Makefile lib/isccfg/include/Makefile lib/isccfg/include/isccfg/Makefile lib/lwres/Makefile lib/lwres/include/Makefile lib/lwres/include/lwres/Makefile lib/lwres/include/lwres/netdb.h lib/lwres/include/lwres/platform.h lib/lwres/man/Makefile lib/lwres/tests/Makefile lib/lwres/unix/Makefile lib/lwres/unix/include/Makefile lib/lwres/unix/include/lwres/Makefile lib/tests/Makefile lib/tests/include/Makefile lib/tests/include/tests/Makefile lib/samples/Makefile lib/samples/Makefile-postinstall unit/Makefile unit/unittest.sh"
 
 
 #
@@ -24025,7 +24025,6 @@ do
     "bin/python/isc/tests/dnskey_test.py") CONFIG_FILES="$CONFIG_FILES bin/python/isc/tests/dnskey_test.py" ;;
     "bin/rndc/Makefile") CONFIG_FILES="$CONFIG_FILES bin/rndc/Makefile" ;;
     "bin/tests/Makefile") CONFIG_FILES="$CONFIG_FILES bin/tests/Makefile" ;;
-    "bin/tests/atomic/Makefile") CONFIG_FILES="$CONFIG_FILES bin/tests/atomic/Makefile" ;;
     "bin/tests/db/Makefile") CONFIG_FILES="$CONFIG_FILES bin/tests/db/Makefile" ;;
     "bin/tests/dst/Makefile") CONFIG_FILES="$CONFIG_FILES bin/tests/dst/Makefile" ;;
     "bin/tests/dst/Kdh.+002+18602.key") CONFIG_FILES="$CONFIG_FILES bin/tests/dst/Kdh.+002+18602.key" ;;
index 39e82c92a626bde9e63811b04d08d3a1a532a012..eb0ed24dab8396521ab05c64a9c82393e8ec392e 100644 (file)
@@ -5151,7 +5151,6 @@ AC_CONFIG_FILES([
        bin/python/isc/tests/dnskey_test.py
        bin/rndc/Makefile
        bin/tests/Makefile
-       bin/tests/atomic/Makefile
        bin/tests/db/Makefile
        bin/tests/dst/Makefile
        bin/tests/dst/Kdh.+002+18602.key
index 427569383e1f8e3bc038ae21299b29f11e1e89ec..f5e3b8441d5700a64737e25cf370021508527f21 100644 (file)
@@ -33,7 +33,8 @@ ISCDEPLIBS =  ../libisc.@A@
 LIBS =         @LIBS@ @ATFLIBS@
 
 OBJS =         isctest.@O@
-SRCS =         isctest.c aes_test.c counter_test.c errno_test.c \
+SRCS =         isctest.c aes_test.c atomic_test.c \
+               counter_test.c errno_test.c \
                hash_test.c heap_test.c inet_ntop_test.c lex_test.c \
                mem_test.c netaddr_test.c parse_test.c pool_test.c \
                print_test.c queue_test.c radix_test.c regex_test.c \
@@ -41,7 +42,8 @@ SRCS =                isctest.c aes_test.c counter_test.c errno_test.c \
                symtab_test.c task_test.c taskpool_test.c time_test.c
 
 SUBDIRS =
-TARGETS =      aes_test@EXEEXT@ counter_test@EXEEXT@ errno_test@EXEEXT@ \
+TARGETS =      aes_test@EXEEXT@ atomic_test@EXEEXT@ \
+               counter_test@EXEEXT@ errno_test@EXEEXT@ \
                hash_test@EXEEXT@ heap_test@EXEEXT@ inet_ntop_test@EXEEXT@ \
                lex_test@EXEEXT@ mem_test@EXEEXT@ netaddr_test@EXEEXT@ \
                parse_test@EXEEXT@ pool_test@EXEEXT@ print_test@EXEEXT@ \
@@ -52,6 +54,10 @@ TARGETS =    aes_test@EXEEXT@ counter_test@EXEEXT@ errno_test@EXEEXT@ \
 
 @BIND9_MAKE_RULES@
 
+atomic_test@EXEEXT@: atomic_test.@O@ isctest.@O@ ${ISCDEPLIBS}
+       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
+                       atomic_test.@O@ isctest.@O@ ${ISCLIBS} ${LIBS}
+
 aes_test@EXEEXT@: aes_test.@O@ ${ISCDEPLIBS}
        ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
                        aes_test.@O@ ${ISCLIBS} ${LIBS}
similarity index 62%
rename from bin/tests/atomic/t_atomic.c
rename to lib/isc/tests/atomic_test.c
index d75bdba9df70902fe4900c54cac1dda3aedce57c..82320118cca94799a9755b3f68764854c12132e1 100644 (file)
  */
 
 #include <config.h>
-
-#include <ctype.h>
 #include <stdlib.h>
 
+#include <atf-c.h>
+
 #include <isc/atomic.h>
-#include <isc/mem.h>
-#include <isc/util.h>
-#include <isc/string.h>
 #include <isc/print.h>
-#include <isc/event.h>
-#include <isc/task.h>
-
-#include <tests/t_api.h>
-
-char *progname;
-
-#define CHECK(x) RUNTIME_CHECK(ISC_R_SUCCESS == (x))
-
-isc_mem_t *mctx = NULL;
-isc_taskmgr_t *task_manager = NULL;
+#include <isc/result.h>
 
-#if defined(ISC_PLATFORM_HAVEXADD) || defined(ISC_PLATFORM_HAVEXADDQ) || \
-    defined(ISC_PLATFORM_HAVEATOMICSTORE) || \
-    defined(ISC_PLATFORM_HAVEATOMICSTOREQ)
-static void
-setup(void) {
-       /* 1 */ CHECK(isc_mem_create(0, 0, &mctx));
-       /* 2 */ CHECK(isc_taskmgr_create(mctx, 32, 0, &task_manager));
-}
-
-static void
-teardown(void) {
-       /* 2 */ isc_taskmgr_destroy(&task_manager);
-       /* 1 */ isc_mem_destroy(&mctx);
-}
-#endif
+#include "isctest.h"
 
 #define TASKS 32
-#define ITERATIONS 10000
+#define ITERATIONS 1000
 #define COUNTS_PER_ITERATION 1000
 #define INCREMENT_64 (isc_int64_t)0x0000000010000000
 #define EXPECTED_COUNT_32 (TASKS * ITERATIONS * COUNTS_PER_ITERATION)
@@ -85,17 +58,20 @@ do_xadd(isc_task_t *task, isc_event_t *ev) {
        }
 }
 
-static void
-test_atomic_xadd() {
-       int test_result;
+ATF_TC(atomic_xadd);
+ATF_TC_HEAD(atomic_xadd, tc) {
+       atf_tc_set_md_var(tc, "descr", "atomic XADD");
+}
+ATF_TC_BODY(atomic_xadd, tc) {
+       isc_result_t result;
        isc_task_t *tasks[TASKS];
-       isc_event_t *event;
+       isc_event_t *event = NULL;
        int i;
 
-       t_assert("test_atomic_xadd", 1, T_REQUIRED, "%s",
-                "ensure that isc_atomic_xadd() works.");
+       UNUSED(tc);
 
-       setup();
+       result = isc_test_begin(NULL, ISC_TRUE);
+       ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
        memset(counters, 0, sizeof(counters));
        counter_32 = 0;
@@ -105,20 +81,21 @@ test_atomic_xadd() {
         */
        for (i = 0 ; i < TASKS ; i++) {
                tasks[i] = NULL;
-               CHECK(isc_task_create(task_manager, 0, &tasks[i]));
+               ATF_REQUIRE_EQ(isc_task_create(taskmgr, 0, &tasks[i]),
+                              ISC_R_SUCCESS);
                event = isc_event_allocate(mctx, NULL, 1000, do_xadd,
-                                          &counters[i], sizeof(struct isc_event));
+                                          &counters[i],
+                                          sizeof(struct isc_event));
+               ATF_REQUIRE(event != NULL);
                isc_task_sendanddetach(&tasks[i], &event);
        }
 
-       teardown();
+       isc_test_end();
 
-       test_result = T_PASS;
-       t_info("32-bit counter %d, expected %d\n", counter_32, EXPECTED_COUNT_32);
-       if (counter_32 != EXPECTED_COUNT_32)
-               test_result = T_FAIL;
-       t_result(test_result);
+       printf("32-bit counter %d, expected %d\n",
+              counter_32, EXPECTED_COUNT_32);
 
+       ATF_CHECK_EQ(counter_32, EXPECTED_COUNT_32);
        counter_32 = 0;
 }
 #endif
@@ -143,17 +120,20 @@ do_xaddq(isc_task_t *task, isc_event_t *ev) {
        }
 }
 
-static void
-test_atomic_xaddq() {
-       int test_result;
+ATF_TC(atomic_xaddq);
+ATF_TC_HEAD(atomic_xaddq, tc) {
+       atf_tc_set_md_var(tc, "descr", "atomic XADDQ");
+}
+ATF_TC_BODY(atomic_xaddq, tc) {
+       isc_result_t result;
        isc_task_t *tasks[TASKS];
-       isc_event_t *event;
+       isc_event_t *event = NULL;
        int i;
 
-       t_assert("test_atomic_xaddq", 1, T_REQUIRED, "%s",
-                "ensure that isc_atomic_xaddq() works.");
+       UNUSED(tc);
 
-       setup();
+       result = isc_test_begin(NULL, ISC_TRUE);
+       ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
        memset(counters, 0, sizeof(counters));
        counter_64 = 0;
@@ -163,26 +143,27 @@ test_atomic_xaddq() {
         */
        for (i = 0 ; i < TASKS ; i++) {
                tasks[i] = NULL;
-               CHECK(isc_task_create(task_manager, 0, &tasks[i]));
+               ATF_REQUIRE_EQ(isc_task_create(taskmgr, 0, &tasks[i]),
+                              ISC_R_SUCCESS);
                event = isc_event_allocate(mctx, NULL, 1000, do_xaddq,
-                                          &counters[i], sizeof(struct isc_event));
+                                          &counters[i],
+                                          sizeof(struct isc_event));
+               ATF_REQUIRE(event != NULL);
                isc_task_sendanddetach(&tasks[i], &event);
        }
 
-       teardown();
+       isc_test_end();
 
-       test_result = T_PASS;
-       t_info("64-bit counter %"ISC_PRINT_QUADFORMAT"d, expected %"ISC_PRINT_QUADFORMAT"d\n",
+       printf("64-bit counter %"ISC_PRINT_QUADFORMAT"d, "
+              "expected %"ISC_PRINT_QUADFORMAT"d\n",
               counter_64, EXPECTED_COUNT_64);
-       if (counter_64 != EXPECTED_COUNT_64)
-               test_result = T_FAIL;
-       t_result(test_result);
 
-       counter_64 = 0;
+       ATF_CHECK_EQ(counter_64, EXPECTED_COUNT_64);
+       counter_32 = 0;
 }
 #endif
 
-#ifdef ISC_PLATFORM_HAVEATOMICSTORE
+#if defined(ISC_PLATFORM_HAVEATOMICSTORE)
 static isc_int32_t store_32;
 
 static void
@@ -207,19 +188,22 @@ do_store(isc_task_t *task, isc_event_t *ev) {
        }
 }
 
-static void
-test_atomic_store() {
-       int test_result;
+ATF_TC(atomic_store);
+ATF_TC_HEAD(atomic_store, tc) {
+       atf_tc_set_md_var(tc, "descr", "atomic STORE");
+}
+ATF_TC_BODY(atomic_store, tc) {
+       isc_result_t result;
        isc_task_t *tasks[TASKS];
-       isc_event_t *event;
-       int i;
-       isc_uint8_t r;
+       isc_event_t *event = NULL;
        isc_uint32_t val;
+       isc_uint8_t r;
+       int i;
 
-       t_assert("test_atomic_store", 1, T_REQUIRED, "%s",
-                "ensure that isc_atomic_store() works.");
+       UNUSED(tc);
 
-       setup();
+       result = isc_test_begin(NULL, ISC_TRUE);
+       ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
        memset(counters, 0, sizeof(counters));
        store_32 = 0;
@@ -230,24 +214,24 @@ test_atomic_store() {
         */
        for (i = 0 ; i < TASKS ; i++) {
                tasks[i] = NULL;
-               CHECK(isc_task_create(task_manager, 0, &tasks[i]));
+               ATF_REQUIRE_EQ(isc_task_create(taskmgr, 0, &tasks[i]),
+                              ISC_R_SUCCESS);
                event = isc_event_allocate(mctx, NULL, 1000, do_store,
                                           &counters[i],
                                           sizeof(struct isc_event));
+               ATF_REQUIRE(event != NULL);
                isc_task_sendanddetach(&tasks[i], &event);
        }
 
-       teardown();
+       isc_test_end();
 
-       test_result = T_PASS;
        r = store_32 & 0xff;
        val = (r << 24) | (r << 16) | (r << 8) | r;
-       t_info("32-bit store 0x%x, expected 0x%x\n",
+
+       printf("32-bit store 0x%x, expected 0x%x\n",
               (isc_uint32_t) store_32, val);
-       if ((isc_uint32_t) store_32 != val)
-               test_result = T_FAIL;
-       t_result(test_result);
 
+       ATF_CHECK_EQ((isc_uint32_t) store_32, val);
        store_32 = 0;
 }
 #endif
@@ -281,73 +265,74 @@ do_storeq(isc_task_t *task, isc_event_t *ev) {
        }
 }
 
-static void
-test_atomic_storeq() {
-       int test_result;
+ATF_TC(atomic_storeq);
+ATF_TC_HEAD(atomic_storeq, tc) {
+       atf_tc_set_md_var(tc, "descr", "atomic STOREQ");
+}
+ATF_TC_BODY(atomic_storeq, tc) {
+       isc_result_t result;
        isc_task_t *tasks[TASKS];
-       isc_event_t *event;
-       int i;
-       isc_uint8_t r;
+       isc_event_t *event = NULL;
        isc_uint64_t val;
+       isc_uint32_t r;
+       int i;
 
-       t_assert("test_atomic_storeq", 1, T_REQUIRED, "%s",
-                "ensure that isc_atomic_storeq() works.");
+       UNUSED(tc);
 
-       setup();
+       result = isc_test_begin(NULL, ISC_TRUE);
+       ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
        memset(counters, 0, sizeof(counters));
        store_64 = 0;
 
        /*
-        * Create our tasks, and allocate an event to get the counters going.
+        * Create our tasks, and allocate an event to get the counters
+        * going.
         */
        for (i = 0 ; i < TASKS ; i++) {
                tasks[i] = NULL;
-               CHECK(isc_task_create(task_manager, 0, &tasks[i]));
+               ATF_REQUIRE_EQ(isc_task_create(taskmgr, 0, &tasks[i]),
+                              ISC_R_SUCCESS);
                event = isc_event_allocate(mctx, NULL, 1000, do_storeq,
-                                          &counters[i], sizeof(struct isc_event));
+                                          &counters[i],
+                                          sizeof(struct isc_event));
+               ATF_REQUIRE(event != NULL);
                isc_task_sendanddetach(&tasks[i], &event);
        }
 
-       teardown();
+       isc_test_end();
 
-       test_result = T_PASS;
        r = store_64 & 0xff;
        val = (((isc_uint64_t) r << 24) |
               ((isc_uint64_t) r << 16) |
               ((isc_uint64_t) r << 8) |
               (isc_uint64_t) r);
        val |= ((isc_uint64_t) val << 32);
-       t_info("64-bit store 0x%"ISC_PRINT_QUADFORMAT"x, expected 0x%"ISC_PRINT_QUADFORMAT"x\n",
+
+       printf("64-bit store 0x%"ISC_PRINT_QUADFORMAT"x, "
+              "expected 0x%"ISC_PRINT_QUADFORMAT"x\n",
               (isc_uint64_t) store_64, val);
-       if ((isc_uint64_t) store_64 != val)
-               test_result = T_FAIL;
-       t_result(test_result);
 
+       ATF_CHECK_EQ((isc_uint64_t) store_64, val);
        store_64 = 0;
 }
-#endif /* ISC_PLATFORM_HAVEATOMICSTOREQ */
+#endif
 
-testspec_t T_testlist[] = {
+/*
+ * Main
+ */
+ATF_TP_ADD_TCS(tp) {
 #if defined(ISC_PLATFORM_HAVEXADD)
-       { (PFV) test_atomic_xadd,       "test_atomic_xadd"              },
+       ATF_TP_ADD_TC(tp, atomic_xadd);
 #endif
 #if defined(ISC_PLATFORM_HAVEXADDQ)
-       { (PFV) test_atomic_xaddq,      "test_atomic_xaddq"             },
+       ATF_TP_ADD_TC(tp, atomic_xaddq);
 #endif
 #ifdef ISC_PLATFORM_HAVEATOMICSTORE
-       { (PFV) test_atomic_store,      "test_atomic_store"             },
+       ATF_TP_ADD_TC(tp, atomic_store);
 #endif
 #if defined(ISC_PLATFORM_HAVEATOMICSTOREQ)
-       { (PFV) test_atomic_storeq,     "test_atomic_storeq"            },
+       ATF_TP_ADD_TC(tp, atomic_storeq);
 #endif
-       { (PFV) 0,                      NULL }
-};
-
-#ifdef WIN32
-int
-main(int argc, char **argv) {
-       t_settests(T_testlist);
-       return (t_main(argc, argv));
+       return (atf_no_error());
 }
-#endif
index 4377d3794dc694c02c4f92c0702dee49f1afb035..bee9da79fef863db8364b7cdb4b7707d79b300a8 100644 (file)
 ./bin/tests/Kchild.example.+003+04017.private  X       2000,2001
 ./bin/tests/Makefile.in                                MAKE    1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
 ./bin/tests/adb_test.c                         C       1999,2000,2001,2004,2005,2007,2009,2011,2012,2013,2015
-./bin/tests/atomic/Makefile.in                 MAKE    2011,2012,2014
-./bin/tests/atomic/t_atomic.c                  C       2011,2013,2015,2016
-./bin/tests/atomic/win32/t_atomic.dsp.in       X       2013
-./bin/tests/atomic/win32/t_atomic.dsw          X       2013
-./bin/tests/atomic/win32/t_atomic.mak.in       X       2013
-./bin/tests/atomic/win32/t_atomic.vcxproj.filters.in   X       2013,2015
-./bin/tests/atomic/win32/t_atomic.vcxproj.in   X       2013,2015,2016,2017
-./bin/tests/atomic/win32/t_atomic.vcxproj.user X       2013
 ./bin/tests/backtrace_test.c                   C       2009,2013,2015
 ./bin/tests/bigtest/README                     TXT.BRIEF       2013
 ./bin/tests/bigtest/buildzones.sh              SH      2013
index 640d3edfa05d02c46da3776ab478673cd7e67e63..a69dce65169506b4cf9d0fe037551bd91588157f 100644 (file)
@@ -278,8 +278,6 @@ my @projectlist = ("..\\bin\\check\\win32\\checkconf.vcxproj",
                    "..\\bin\\tools\\win32\\nsec3hash.vcxproj.filters",
                    "..\\bin\\tools\\win32\\rrchecker.vcxproj",
                    "..\\bin\\tools\\win32\\rrchecker.vcxproj.filters",
-                   "..\\bin\\tests\\atomic\\win32\\t_atomic.vcxproj",
-                   "..\\bin\\tests\\atomic\\win32\\t_atomic.vcxproj.filters",
                    "..\\bin\\tests\\db\\win32\\t_db.vcxproj",
                    "..\\bin\\tests\\db\\win32\\t_db.vcxproj.filters",
                    "..\\bin\\tests\\dst\\win32\\t_dst.vcxproj",
index aefcf1ce5fafd550041804c6b2e152a5a44c4e62..574202e2fa86e2f50c7a9ec89dc1ccdcb53b66df 100644 (file)
@@ -496,14 +496,6 @@ EndProject
 @END PKCS11
 @IF TESTS
 @IF ATOMIC
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "t_atomic", "..\bin\tests\atomic\win32\t_atomic.vcxproj", "{EC6ECB35-58C0-48EC-BAC9-9A652D9406C9}"
-       ProjectSection(ProjectDependencies) = postProject
-               {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}
-               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}
-               {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}
-               {F6F08940-7597-4FEE-9CE0-E09A009C45A3} = {F6F08940-7597-4FEE-9CE0-E09A009C45A3}
-       EndProjectSection
-EndProject
 @END ATOMIC
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "t_db", "..\bin\tests\db\win32\t_db.vcxproj", "{E6338E67-3224-4E66-9463-7AD719DA9346}"
        ProjectSection(ProjectDependencies) = postProject