Fix unit tests building, broken after the file-utils addition.

diff --git a/src/common/tests/Makefile.am b/src/common/tests/Makefile.am
index 7b18f889ee6eddf924857ace2e1e9748005a2570..e69e4ee088ec6ec69535ff760011daa487277d16 100644 (file)
--- a/src/common/tests/Makefile.am
+++ b/src/common/tests/Makefile.am
@@ -12,11 +12,11 @@ AM_CPPFLAGS = \
 
 TEST_PROGS += xml_test
 xml_test_SOURCES = xml_test.c
 
 TEST_PROGS += xml_test
 xml_test_SOURCES = xml_test.c

-xml_test_LDADD = $(common_ldadd) ../xml.o ../stringtable.o ../utils.o ../codeconv.o ../quoted-printable.o ../unmime.o
+xml_test_LDADD = $(common_ldadd) ../xml.o ../stringtable.o ../utils.o ../codeconv.o ../quoted-printable.o ../unmime.o ../file-utils.o

 
 TEST_PROGS += codeconv_test
 codeconv_test_SOURCES = codeconv_test.c
 
 TEST_PROGS += codeconv_test
 codeconv_test_SOURCES = codeconv_test.c

-codeconv_test_LDADD = $(common_ldadd) ../codeconv.o ../utils.o ../quoted-printable.o ../unmime.o
+codeconv_test_LDADD = $(common_ldadd) ../codeconv.o ../utils.o ../quoted-printable.o ../unmime.o ../file-utils.o

 
 TEST_PROGS += md5_test
 md5_test_SOURCES = md5_test.c
 
 TEST_PROGS += md5_test
 md5_test_SOURCES = md5_test.c

diff --git a/src/common/tests/codeconv_test.c b/src/common/tests/codeconv_test.c
index 3b93eae3cde8a33db0d21ea5926529ae160c24c6..3cf74370c3a9e8fbc61bc9c2da9587cc35eff8c4 100644 (file)
--- a/src/common/tests/codeconv_test.c
+++ b/src/common/tests/codeconv_test.c
@@ -3,6 +3,7 @@
 #include "codeconv.h"
 
 #include "mock_prefs_common_get_use_shred.h"
 #include "codeconv.h"
 
 #include "mock_prefs_common_get_use_shred.h"

+#include "mock_prefs_common_get_flush_metadata.h"

 
 struct td {
        gchar *pre; /* Input string */
 
 struct td {
        gchar *pre; /* Input string */

diff --git a/src/common/tests/mock_prefs_common_get_flush_metadata.h b/src/common/tests/mock_prefs_common_get_flush_metadata.h
new file mode 100644 (file)
index 0000000..d9f6a12
--- /dev/null
+++ b/src/common/tests/mock_prefs_common_get_flush_metadata.h
@@ -0,0 +1,5 @@
+gboolean prefs_common_get_flush_metadata(void)
+{
+       return FALSE;
+}
+

diff --git a/src/common/tests/xml_test.c b/src/common/tests/xml_test.c
index 1e58d8d635b252b9b9b50a0de7b4c2edeeae4c9f..015971202372f5bea0974fe8f27c61ee924a243c 100644 (file)
--- a/src/common/tests/xml_test.c
+++ b/src/common/tests/xml_test.c
@@ -3,6 +3,7 @@
 #include "xml.h"
 
 #include "mock_prefs_common_get_use_shred.h"
 #include "xml.h"
 
 #include "mock_prefs_common_get_use_shred.h"

+#include "mock_prefs_common_get_flush_metadata.h"

 
 #define DATADIR "data/"
 
 
 #define DATADIR "data/"