Almost fix 'make check'. The only remaining problem is an undefined

reference to lyx::utf8ToUcs4.
I did not fix this since it is an interface violation that should be fixed
otherwise.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17358 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 8392cd1701243a633e01d396167ddfa33dfb6cad..84f8f6cfd7e64219b2240f58f54f87a9dee9e620 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -39,7 +39,6 @@ src/frontends/qt4/Alert_pimpl.C
 src/frontends/qt4/BulletsModule.C
 src/frontends/qt4/Dialogs.C
 src/frontends/qt4/FileDialog.C
-src/frontends/qt4/GuiApplication.C
 src/frontends/qt4/GuiView.C
 src/frontends/qt4/GuiWorkArea.C
 src/frontends/qt4/QAbout.C
@@ -92,6 +91,7 @@ src/insets/insetbox.C
 src/insets/insetbranch.C
 src/insets/insetcaption.C
 src/insets/insetcharstyle.C
+src/insets/insetcommand.C
 src/insets/insetenv.C
 src/insets/insetert.C
 src/insets/insetexternal.C

diff --git a/src/support/tests/Makefile.am b/src/support/tests/Makefile.am
index 4b49c145b50488fbc97c51c558f290dd688558a3..04168ac27df212f2b805132b38e5d7a78b0c1dd6 100644 (file)
--- a/src/support/tests/Makefile.am
+++ b/src/support/tests/Makefile.am
@@ -14,9 +14,11 @@ check_PROGRAMS = \
        filetools \
        lstrings
 
-AM_CPPFLAGS += $(BOOST_INCLUDES)
+AM_CPPFLAGS += $(BOOST_INCLUDES) -I$(srcdir)/../..
 
-convert_LDADD = ../convert.o
+
+convert_LDADD = ../../debug.o ../convert.o ../docstring.o ../lstrings.o ../unicode.o ../qstring_helpers.o $(BOOST_REGEX) $(QT4_CORE_LIB)
+convert_LDFLAGS = $(QT4_CORE_LDFLAGS)
 convert_SOURCES = \
        convert.C \
        boost.C
@@ -26,7 +28,8 @@ filetools_SOURCES = \
        filetools.C \
        boost.C
 
-lstrings_LDADD = ../lstrings.o
+lstrings_LDADD = ../../debug.o ../lstrings.o ../convert.o ../docstring.o ../unicode.o ../qstring_helpers.o $(QT4_CORE_LIB)
+lstrings_LDFLAGS = $(QT4_CORE_LDFLAGS)
 lstrings_SOURCES = \
        lstrings.C \
        boost.C

diff --git a/src/support/tests/convert.C b/src/support/tests/convert.C
index d8033201dd85b6c3238787a3d8c8bcb55b2739c2..7854a30e916b1e29e4d71005e4cd5a5e88ecf633 100644 (file)
--- a/src/support/tests/convert.C
+++ b/src/support/tests/convert.C
@@ -1,6 +1,7 @@
 #include <config.h>
 
 #include "../convert.h"
+#include "../docstring.h"
 
 #include <iostream>
 
@@ -8,6 +9,12 @@ using lyx::convert;
 
 using namespace std;
 
+
+namespace lyx {
+       docstring const _(string const & s) { return from_ascii(s); }
+}
+
+
 void convert_int()
 {
        cout << convert<int>("123") << '\n'

diff --git a/src/support/tests/filetools.C b/src/support/tests/filetools.C
index 058d16d3236ce8472c9e961543dfe217140b883f..4859f8db1848e5bdab14a63a7577d6ae735d398c 100644 (file)
--- a/src/support/tests/filetools.C
+++ b/src/support/tests/filetools.C
@@ -7,9 +7,8 @@ using namespace lyx::support;
 
 using namespace std;
 
-string _(string const & str)
-{
-       return str;
+namespace lyx {
+       docstring const _(string const & s) { return from_ascii(s); }
 }
 
 void test_normalizePath()

diff --git a/src/support/tests/lstrings.C b/src/support/tests/lstrings.C
index 0f173ba36ae0fd2c31ebeee0a1ddb47bfca90e8e..998deafec09c3fe8fd8f2dde40440ec12f01858a 100644 (file)
--- a/src/support/tests/lstrings.C
+++ b/src/support/tests/lstrings.C
@@ -7,6 +7,10 @@ using namespace lyx::support;
 
 using namespace std;
 
+namespace lyx {
+       docstring const _(string const & s) { return from_ascii(s); }
+}
+
 void test_lowercase()
 {
        cout << lowercase('A') << endl;