From 9a3183a76cff35f022088a71a55eeeac4298c240 Mon Sep 17 00:00:00 2001
From: Brian Cox <BrianRCox@gmail.com>
Date: Mon, 13 Jun 2016 18:31:21 -0700
Subject: [PATCH] Enable unit test files moved from db folder

---
 .gitignore                        | 19 +++++++++----------
 src/twtest/Makefile.am            |  3 +++
 src/twtest/Makefile.in            |  9 +++++++--
 src/twtest/blockfile_t.cpp        |  8 ++++----
 src/twtest/blockrecordarray_t.cpp |  4 ++--
 src/twtest/hierdatabase_t.cpp     |  6 +++---
 6 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/.gitignore b/.gitignore
index 52fb503..4854d05 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,20 +7,19 @@ compile
 autom4te.cache/
 bin/
 lib/
+src/siggen/siggen
+src/tripwire/tripwire
+src/twadmin/twadmin
+src/twprint/twprint
+src/twtest/twtest
 **/Makefile
 **/*.o
 **/*.dylib
 **/*.a
 **/*.so
 **/*.dll
-**/siggen
-**/tripwire
-**/twadmin
-**/twprint
-**/twtest
-**/siggen.exe
-**/tripwire.exe
-**/twadmin.exe
-**/twprint.exe
-**/twtest.exe
+**/*.exe
+**/*~
+**/*.bak
+**/.DS_Store
 releases/
diff --git a/src/twtest/Makefile.am b/src/twtest/Makefile.am
index 939f3d6..816da75 100644
--- a/src/twtest/Makefile.am
+++ b/src/twtest/Makefile.am
@@ -9,6 +9,8 @@ LN_S = @LN@
 sbin_PROGRAMS = twtest
 twtest_SOURCES = \
 archive_t.cpp \
+blockfile_t.cpp \
+blockrecordarray_t.cpp \
 charutil_t.cpp \
 cmdlineparser_t.cpp \
 codeconvert_t.cpp \
@@ -48,6 +50,7 @@ genrespeclist_t.cpp \
 genreswitcher_t.cpp \
 growheap_t.cpp \
 hashtable_t.cpp \
+hierdatabase_t.cpp \
 keyfile_t.cpp \
 objectpool_t.cpp \
 platform_t.cpp \
diff --git a/src/twtest/Makefile.in b/src/twtest/Makefile.in
index c46efe1..25e0428 100644
--- a/src/twtest/Makefile.in
+++ b/src/twtest/Makefile.in
@@ -103,7 +103,8 @@ CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(sbindir)"
 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) \
 	configfile_t.$(OBJEXT) cryptoarchive_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) \
 	fspropset_t.$(OBJEXT) fsspec_t.$(OBJEXT) genre_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) \
 	policyparser_t.$(OBJEXT) refcountobj_t.$(OBJEXT) \
 	resources_t.$(OBJEXT) serializer_t.$(OBJEXT) \
@@ -319,6 +321,8 @@ AM_INSTALL_PROGRAM_FLAGS = -m 755
 AM_CPPFLAGS = -I..
 twtest_SOURCES = \
 archive_t.cpp \
+blockfile_t.cpp \
+blockrecordarray_t.cpp \
 charutil_t.cpp \
 cmdlineparser_t.cpp \
 codeconvert_t.cpp \
@@ -358,6 +362,7 @@ genrespeclist_t.cpp \
 genreswitcher_t.cpp \
 growheap_t.cpp \
 hashtable_t.cpp \
+hierdatabase_t.cpp \
 keyfile_t.cpp \
 objectpool_t.cpp \
 platform_t.cpp \
diff --git a/src/twtest/blockfile_t.cpp b/src/twtest/blockfile_t.cpp
index 340f555..65089e9 100644
--- a/src/twtest/blockfile_t.cpp
+++ b/src/twtest/blockfile_t.cpp
@@ -30,11 +30,11 @@
 // info@tripwire.org or www.tripwire.org.
 //
 // blockfile_t
-#include "stddb.h"
-#include "blockfile.h"
-#include "block.h"
+#include "db/stddb.h"
+#include "db/blockfile.h"
+#include "db/block.h"
 #include "core/archive.h"
-#include "test/test.h"
+#include "test.h"
 #include "core/debug.h"
 
 void TestBlockFile()
diff --git a/src/twtest/blockrecordarray_t.cpp b/src/twtest/blockrecordarray_t.cpp
index 181b7a2..4af4aff 100644
--- a/src/twtest/blockrecordarray_t.cpp
+++ b/src/twtest/blockrecordarray_t.cpp
@@ -31,9 +31,9 @@
 //
 // blockrecordarray_t.cpp
 
-#include "stddb.h"
+#include "db/stddb.h"
 #include "db/blockrecordarray.h"
-#include "test/test.h"
+#include "test.h"
 #include "core/debug.h"
 #include "core/error.h"
 
diff --git a/src/twtest/hierdatabase_t.cpp b/src/twtest/hierdatabase_t.cpp
index 064fc53..62d517c 100644
--- a/src/twtest/hierdatabase_t.cpp
+++ b/src/twtest/hierdatabase_t.cpp
@@ -30,9 +30,9 @@
 // info@tripwire.org or www.tripwire.org.
 //
 // hierdatabase_t
-#include "stddb.h"
-#include "hierdatabase.h"
-#include "test/test.h"
+#include "db/stddb.h"
+#include "db/hierdatabase.h"
+#include "test.h"
 #include "core/error.h"
 
 static void PrintDb( cHierDatabase::iterator iter, cDebug d, bool bFirst = true )