From ecbc3a21a99f2212d841df477fce8318e4249bdb Mon Sep 17 00:00:00 2001
From: Brian Carrier <carrier@sleuthkit.org>
Date: Wed, 1 Feb 2012 21:54:43 -0500
Subject: [PATCH] Applied changes from Benson for unit test build
---
INSTALL.txt | 16 +++++++++++++
unit_tests/base/.deps/errors_test.Po | 1 -
unit_tests/base/.deps/test_base.Po | 1 -
unit_tests/base/Makefile.am | 2 +-
unit_tests/base/errors_test.h | 36 ++++++++++++++++++++++++++++
5 files changed, 53 insertions(+), 3 deletions(-)
delete mode 100644 unit_tests/base/.deps/errors_test.Po
delete mode 100644 unit_tests/base/.deps/test_base.Po
create mode 100644 unit_tests/base/errors_test.h
diff --git a/INSTALL.txt b/INSTALL.txt
index 3bb5e7195..c61236d7c 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -72,6 +72,18 @@ need to be in your PATH if you want to run the TSK commands without
specifying '/usr/local/bin' everytime.
+If you get an error like:
+
+ libtool: Version mismatch error. This is libtool 2.2.10, but the
+ libtool: definition of this LT_INIT comes from libtool 2.2.4.
+ libtool: You should recreate aclocal.m4 with macros from libtool 2.2.10
+ libtool: and run autoconf again.
+
+Run:
+ ./bootstrap
+and then go back to running configure and make.
+
+
CONFIGURE OPTIONS
-----------------------------------------------------------------------------
There are some arguments to 'configure' that you can supply to
@@ -92,6 +104,10 @@ if it is installed.
the libewf installation (the directory should have 'lib' and 'include'
directories in it).
+-----------------------------------------------------------------------------
+
+If you are compiling
+
-----------------------------------------------------------------------------
Brian Carrier
carrier <at> sleuthkit <dot> org
diff --git a/unit_tests/base/.deps/errors_test.Po b/unit_tests/base/.deps/errors_test.Po
deleted file mode 100644
index 9ce06a81e..000000000
--- a/unit_tests/base/.deps/errors_test.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/unit_tests/base/.deps/test_base.Po b/unit_tests/base/.deps/test_base.Po
deleted file mode 100644
index 9ce06a81e..000000000
--- a/unit_tests/base/.deps/test_base.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/unit_tests/base/Makefile.am b/unit_tests/base/Makefile.am
index c82dd88f2..815527651 100644
--- a/unit_tests/base/Makefile.am
+++ b/unit_tests/base/Makefile.am
@@ -3,7 +3,7 @@ LDADD = ../../tsk3/libtsk3.la $(CPPUNIT_LIBS)
LDFLAGS = -static
noinst_PROGRAMS = test_base
-test_base_SOURCES= test_base.cpp errors_test.cpp
+test_base_SOURCES= test_base.cpp errors_test.cpp errors_test.h
indent:
indent *.cpp *.h
diff --git a/unit_tests/base/errors_test.h b/unit_tests/base/errors_test.h
new file mode 100644
index 000000000..e7dfbc4cf
--- /dev/null
+++ b/unit_tests/base/errors_test.h
@@ -0,0 +1,36 @@
+/*
+ * errors_test.h
+ *
+ * Created on: Oct 22, 2010
+ * Author: benson
+ */
+
+#ifndef ERRORS_TEST_H_
+#define ERRORS_TEST_H_
+
+#include <cppunit/extensions/HelperMacros.h>
+
+class ErrorsTest : public CppUnit::TestFixture
+{
+ CPPUNIT_TEST_SUITE( ErrorsTest );
+ CPPUNIT_TEST(testInitialState);
+ CPPUNIT_TEST(testLengthChecks);
+#ifdef HAVE_PTHREAD
+ CPPUNIT_TEST(testMultithreaded);
+#endif
+ CPPUNIT_TEST_SUITE_END();
+
+public:
+ void setUp();
+ void tearDown();
+
+ void testConstructor();
+ void testInitialState();
+ void testLengthChecks();
+#ifdef HAVE_PTHREAD
+ void testMultithreaded();
+#endif
+};
+
+
+#endif /* ERRORS_TEST_H_ */
--
GitLab