Enable unit test files moved from db folder

This commit is contained in:
Brian Cox 2016-06-13 18:31:21 -07:00
parent 7458e86e7e
commit 9a3183a76c
6 changed files with 28 additions and 21 deletions

19
.gitignore vendored
View File

@ -7,20 +7,19 @@ compile
autom4te.cache/ autom4te.cache/
bin/ bin/
lib/ lib/
src/siggen/siggen
src/tripwire/tripwire
src/twadmin/twadmin
src/twprint/twprint
src/twtest/twtest
**/Makefile **/Makefile
**/*.o **/*.o
**/*.dylib **/*.dylib
**/*.a **/*.a
**/*.so **/*.so
**/*.dll **/*.dll
**/siggen **/*.exe
**/tripwire **/*~
**/twadmin **/*.bak
**/twprint **/.DS_Store
**/twtest
**/siggen.exe
**/tripwire.exe
**/twadmin.exe
**/twprint.exe
**/twtest.exe
releases/ releases/

View File

@ -9,6 +9,8 @@ LN_S = @LN@
sbin_PROGRAMS = twtest sbin_PROGRAMS = twtest
twtest_SOURCES = \ twtest_SOURCES = \
archive_t.cpp \ archive_t.cpp \
blockfile_t.cpp \
blockrecordarray_t.cpp \
charutil_t.cpp \ charutil_t.cpp \
cmdlineparser_t.cpp \ cmdlineparser_t.cpp \
codeconvert_t.cpp \ codeconvert_t.cpp \
@ -48,6 +50,7 @@ genrespeclist_t.cpp \
genreswitcher_t.cpp \ genreswitcher_t.cpp \
growheap_t.cpp \ growheap_t.cpp \
hashtable_t.cpp \ hashtable_t.cpp \
hierdatabase_t.cpp \
keyfile_t.cpp \ keyfile_t.cpp \
objectpool_t.cpp \ objectpool_t.cpp \
platform_t.cpp \ platform_t.cpp \

View File

@ -103,7 +103,8 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES = CONFIG_CLEAN_VPATH_FILES =
am__installdirs = "$(DESTDIR)$(sbindir)" am__installdirs = "$(DESTDIR)$(sbindir)"
PROGRAMS = $(sbin_PROGRAMS) PROGRAMS = $(sbin_PROGRAMS)
am_twtest_OBJECTS = archive_t.$(OBJEXT) charutil_t.$(OBJEXT) \ am_twtest_OBJECTS = archive_t.$(OBJEXT) blockfile_t.$(OBJEXT) \
blockrecordarray_t.$(OBJEXT) charutil_t.$(OBJEXT) \
cmdlineparser_t.$(OBJEXT) codeconvert_t.$(OBJEXT) \ cmdlineparser_t.$(OBJEXT) codeconvert_t.$(OBJEXT) \
configfile_t.$(OBJEXT) cryptoarchive_t.$(OBJEXT) \ configfile_t.$(OBJEXT) cryptoarchive_t.$(OBJEXT) \
crytpo_t.$(OBJEXT) dbdatasource_t.$(OBJEXT) debug_t.$(OBJEXT) \ crytpo_t.$(OBJEXT) dbdatasource_t.$(OBJEXT) debug_t.$(OBJEXT) \
@ -121,7 +122,8 @@ am_twtest_OBJECTS = archive_t.$(OBJEXT) charutil_t.$(OBJEXT) \
fspropcalc_t.$(OBJEXT) fspropdisplayer_t.$(OBJEXT) \ fspropcalc_t.$(OBJEXT) fspropdisplayer_t.$(OBJEXT) \
fspropset_t.$(OBJEXT) fsspec_t.$(OBJEXT) genre_t.$(OBJEXT) \ fspropset_t.$(OBJEXT) fsspec_t.$(OBJEXT) genre_t.$(OBJEXT) \
genrespeclist_t.$(OBJEXT) genreswitcher_t.$(OBJEXT) \ genrespeclist_t.$(OBJEXT) genreswitcher_t.$(OBJEXT) \
growheap_t.$(OBJEXT) hashtable_t.$(OBJEXT) keyfile_t.$(OBJEXT) \ growheap_t.$(OBJEXT) hashtable_t.$(OBJEXT) \
hierdatabase_t.$(OBJEXT) keyfile_t.$(OBJEXT) \
objectpool_t.$(OBJEXT) platform_t.$(OBJEXT) \ objectpool_t.$(OBJEXT) platform_t.$(OBJEXT) \
policyparser_t.$(OBJEXT) refcountobj_t.$(OBJEXT) \ policyparser_t.$(OBJEXT) refcountobj_t.$(OBJEXT) \
resources_t.$(OBJEXT) serializer_t.$(OBJEXT) \ resources_t.$(OBJEXT) serializer_t.$(OBJEXT) \
@ -319,6 +321,8 @@ AM_INSTALL_PROGRAM_FLAGS = -m 755
AM_CPPFLAGS = -I.. AM_CPPFLAGS = -I..
twtest_SOURCES = \ twtest_SOURCES = \
archive_t.cpp \ archive_t.cpp \
blockfile_t.cpp \
blockrecordarray_t.cpp \
charutil_t.cpp \ charutil_t.cpp \
cmdlineparser_t.cpp \ cmdlineparser_t.cpp \
codeconvert_t.cpp \ codeconvert_t.cpp \
@ -358,6 +362,7 @@ genrespeclist_t.cpp \
genreswitcher_t.cpp \ genreswitcher_t.cpp \
growheap_t.cpp \ growheap_t.cpp \
hashtable_t.cpp \ hashtable_t.cpp \
hierdatabase_t.cpp \
keyfile_t.cpp \ keyfile_t.cpp \
objectpool_t.cpp \ objectpool_t.cpp \
platform_t.cpp \ platform_t.cpp \

View File

@ -30,11 +30,11 @@
// info@tripwire.org or www.tripwire.org. // info@tripwire.org or www.tripwire.org.
// //
// blockfile_t // blockfile_t
#include "stddb.h" #include "db/stddb.h"
#include "blockfile.h" #include "db/blockfile.h"
#include "block.h" #include "db/block.h"
#include "core/archive.h" #include "core/archive.h"
#include "test/test.h" #include "test.h"
#include "core/debug.h" #include "core/debug.h"
void TestBlockFile() void TestBlockFile()

View File

@ -31,9 +31,9 @@
// //
// blockrecordarray_t.cpp // blockrecordarray_t.cpp
#include "stddb.h" #include "db/stddb.h"
#include "db/blockrecordarray.h" #include "db/blockrecordarray.h"
#include "test/test.h" #include "test.h"
#include "core/debug.h" #include "core/debug.h"
#include "core/error.h" #include "core/error.h"

View File

@ -30,9 +30,9 @@
// info@tripwire.org or www.tripwire.org. // info@tripwire.org or www.tripwire.org.
// //
// hierdatabase_t // hierdatabase_t
#include "stddb.h" #include "db/stddb.h"
#include "hierdatabase.h" #include "db/hierdatabase.h"
#include "test/test.h" #include "test.h"
#include "core/error.h" #include "core/error.h"
static void PrintDb( cHierDatabase::iterator iter, cDebug d, bool bFirst = true ) static void PrintDb( cHierDatabase::iterator iter, cDebug d, bool bFirst = true )