GNOME.org
 

[gnome-commander/CppUnit: 14/16] Corrects path names of includes; unomments broken tests in makefile

commit bc4829ea62da43c334482aa3a9daaebf96a539fa
Author: Uwe Scholz <uwescholz src gnome org>
Date:   Sun Oct 4 00:22:21 2015 +0200

    Corrects path names of includes; unomments broken tests in makefile

 tests/intviewer/Makefile.am         |   95 ++++++++++++++++++++---------------
 tests/intviewer/bm_byte_test.cc     |    4 +-
 tests/intviewer/bm_chartype_test.cc |    6 +-
 tests/intviewer/datapresentation.cc |   10 ++--
 tests/intviewer/dualrenderer.cc     |    3 +-
 tests/intviewer/fileops.cc          |    6 +-
 tests/intviewer/imagerenderer.cc    |    2 +-
 tests/intviewer/inputmodes.cc       |    8 ++--
 tests/intviewer/search_dlg_test.cc  |    2 +-
 tests/intviewer/textrenderer.cc     |    2 +-
 tests/intviewer/viewerwidget.cc     |    2 +-
 tests/intviewer/viewerwindow.cc     |    2 +-
 12 files changed, 78 insertions(+), 64 deletions(-)
---
diff --git a/tests/intviewer/Makefile.am b/tests/intviewer/Makefile.am
index a0beded..2f4cb7e 100644
--- a/tests/intviewer/Makefile.am
+++ b/tests/intviewer/Makefile.am
@@ -1,4 +1,23 @@
 ## Process this file with automake to produce Makefile.in
+#      intviewer_textrenderer
+#      intviewer_viewerwindow
+#      intviewer_search_dlg_test
+
+TESTS = \
+       intviewer_fileops \
+       intviewer_inputmodes \
+       intviewer_datapresentation \
+       intviewer_imagerenderer \
+       intviewer_dualrenderer \
+       intviewer_viewerwidget \
+       intviewer_bm_byte_test \
+       intviewer_bm_chartype_test \
+       intviewer_utils_test
+
+
+check_PROGRAMS = $(TESTS)
+
+TESTLIBS = $(GLIB_LIBS) $(GTK_LIBS) $(GNOMEUI_LIBS) $(top_builddir)/src/intviewer/libgviewer.a
 
 AM_CPPFLAGS = \
        $(CC_WARNINGS) \
@@ -7,56 +26,52 @@ AM_CPPFLAGS = \
        $(GNOMEUI_CFLAGS) \
        -I$(top_builddir)/src
 
-noinst_PROGRAMS = fileops inputmodes datapresentation textrenderer imagerenderer dualrenderer viewerwidget 
viewerwindow bm_byte_test bm_chartype_test utils_test search_dlg_test
-
-TESTLIBS = $(GLIB_LIBS) $(GTK_LIBS) $(GNOMEUI_LIBS) $(top_builddir)/src/libgviewer/libgviewer.a
-
-fileops_SOURCES = fileops.c
-fileops_LDADD = $(TESTLIBS)
-fileops_LDFLAGS = $(TESTLIBS)
+intviewer_fileops_SOURCES = fileops.cc
+intviewer_fileops_CXXFLAGS = $(TESTLIBS)
+intviewer_fileops_LDFLAGS = $(TESTLIBS)
 
-inputmodes_SOURCES = inputmodes.c
-inputmodes_LDADD = $(TESTLIBS)
-inputmodes_LDFLAGS = $(TESTLIBS)
+intviewer_inputmodes_SOURCES = inputmodes.cc
+intviewer_inputmodes_CXXFLAGS = $(TESTLIBS)
+intviewer_inputmodes_LDFLAGS = $(TESTLIBS)
 
-datapresentation_SOURCES = datapresentation.c
-datapresentation_LDADD = $(TESTLIBS)
-datapresentation_LDFLAGS = $(TESTLIBS)
+intviewer_datapresentation_SOURCES = datapresentation.cc
+intviewer_datapresentation_CXXFLAGS = $(TESTLIBS)
+intviewer_datapresentation_LDFLAGS = $(TESTLIBS)
 
-textrenderer_SOURCES = textrenderer.c
-textrenderer_LDADD = $(TESTLIBS)
-textrenderer_LDFLAGS = $(TESTLIBS)
+#intviewer_textrenderer_SOURCES = textrenderer.cc
+#intviewer_textrenderer_CXXFLAGS = $(TESTLIBS)
+#intviewer_textrenderer_LDFLAGS = $(TESTLIBS)
 
-imagerenderer_SOURCES = imagerenderer.c
-imagerenderer_LDADD = $(TESTLIBS)
-imagerenderer_LDFLAGS = $(TESTLIBS)
+intviewer_imagerenderer_SOURCES = imagerenderer.cc
+intviewer_imagerenderer_CXXFLAGS = $(TESTLIBS)
+intviewer_imagerenderer_LDFLAGS = $(TESTLIBS)
 
-dualrenderer_SOURCES = dualrenderer.c
-dualrenderer_LDADD = $(TESTLIBS)
-dualrenderer_LDFLAGS = $(TESTLIBS)
+intviewer_dualrenderer_SOURCES = dualrenderer.cc
+intviewer_dualrenderer_CXXFLAGS = $(TESTLIBS)
+intviewer_dualrenderer_LDFLAGS = $(TESTLIBS)
 
-viewerwidget_SOURCES = viewerwidget.c
-viewerwidget_LDADD = $(TESTLIBS)
-viewerwidget_LDFLAGS = $(TESTLIBS)
+intviewer_viewerwidget_SOURCES = viewerwidget.cc
+intviewer_viewerwidget_CXXFLAGS = $(TESTLIBS)
+intviewer_viewerwidget_LDFLAGS = $(TESTLIBS)
 
-viewerwindow_SOURCES = viewerwindow.c
-viewerwindow_LDADD = $(TESTLIBS)
-viewerwindow_LDFLAGS = $(TESTLIBS)
+#intviewer_viewerwindow_SOURCES = viewerwindow.cc
+#intviewer_viewerwindow_CXXFLAGS = $(TESTLIBS)
+#intviewer_viewerwindow_LDFLAGS = $(TESTLIBS)
 
-bm_byte_test_SOURCES = bm_byte_test.c
-bm_byte_test_LDADD = $(TESTLIBS)
-bm_byte_test_LDFLAGS = $(TESTLIBS)
+intviewer_bm_byte_test_SOURCES = bm_byte_test.cc
+intviewer_bm_byte_test_CXXFLAGS = $(TESTLIBS)
+intviewer_bm_byte_test_LDFLAGS = $(TESTLIBS)
 
-bm_chartype_test_SOURCES = bm_chartype_test.c
-bm_chartype_test_LDADD = $(TESTLIBS)
-bm_chartype_test_LDFLAGS = $(TESTLIBS)
+intviewer_bm_chartype_test_SOURCES = bm_chartype_test.cc
+intviewer_bm_chartype_test_CXXFLAGS = $(TESTLIBS) -fpermissive
+intviewer_bm_chartype_test_LDFLAGS = $(TESTLIBS)
 
-utils_test_SOURCES = utils_test.c
-utils_test_LDADD = $(TESTLIBS)
-utils_test_LDFLAGS = $(TESTLIBS)
+intviewer_utils_test_SOURCES = viewer_utils_test.cc
+intviewer_utils_test_CXXFLAGS = $(TESTLIBS)
+intviewer_utils_test_LDFLAGS = $(TESTLIBS)
 
-search_dlg_test_SOURCES = search_dlg_test.c
-search_dlg_test_LDADD = $(TESTLIBS)
-search_dlg_test_LDFLAGS = $(TESTLIBS)
+#search_dlg_test_SOURCES = search_dlg_test.cc
+#search_dlg_test_CXXFLAGS = $(TESTLIBS)
+#search_dlg_test_LDFLAGS = $(TESTLIBS)
 
 -include $(top_srcdir)/git.mk
diff --git a/tests/intviewer/bm_byte_test.cc b/tests/intviewer/bm_byte_test.cc
index 783a8f5..67b7af3 100644
--- a/tests/intviewer/bm_byte_test.cc
+++ b/tests/intviewer/bm_byte_test.cc
@@ -23,8 +23,8 @@
 
 #include <glib.h>
 #include <stdio.h>
-#include <libgviewer/gvtypes.h>
-#include <libgviewer/bm_byte.h>
+#include <intviewer/gvtypes.h>
+#include <intviewer/bm_byte.h>
 
 int main()
 {
diff --git a/tests/intviewer/bm_chartype_test.cc b/tests/intviewer/bm_chartype_test.cc
index c230458..fc266f5 100644
--- a/tests/intviewer/bm_chartype_test.cc
+++ b/tests/intviewer/bm_chartype_test.cc
@@ -24,9 +24,9 @@
 #include <glib.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <libgviewer/gvtypes.h>
-#include <libgviewer/viewer-utils.h>
-#include <libgviewer/bm_chartype.h>
+#include <intviewer/gvtypes.h>
+#include <intviewer/viewer-utils.h>
+#include <intviewer/bm_chartype.h>
 
 void print_badchar(gpointer key, gpointer value, gpointer user_data)
 {
diff --git a/tests/intviewer/datapresentation.cc b/tests/intviewer/datapresentation.cc
index 1c78343..857e103 100644
--- a/tests/intviewer/datapresentation.cc
+++ b/tests/intviewer/datapresentation.cc
@@ -26,11 +26,11 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include <libgviewer/libgviewer.h>
-#include <libgviewer/gvtypes.h>
-#include <libgviewer/fileops.h>
-#include <libgviewer/inputmodes.h>
-#include <libgviewer/datapresentation.h>
+#include <intviewer/libgviewer.h>
+#include <intviewer/gvtypes.h>
+#include <intviewer/fileops.h>
+#include <intviewer/inputmodes.h>
+#include <intviewer/datapresentation.h>
 
 static offset_type start_line;
 static offset_type end_line;
diff --git a/tests/intviewer/dualrenderer.cc b/tests/intviewer/dualrenderer.cc
index 4010507..13443de 100644
--- a/tests/intviewer/dualrenderer.cc
+++ b/tests/intviewer/dualrenderer.cc
@@ -30,8 +30,7 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 
-#include <libgviewer/libgviewer.h>
-
+#include <intviewer/libgviewer.h>
 
 int main(int argc, char *argv[])
 {
diff --git a/tests/intviewer/fileops.cc b/tests/intviewer/fileops.cc
index 1839c09..c125594 100644
--- a/tests/intviewer/fileops.cc
+++ b/tests/intviewer/fileops.cc
@@ -24,9 +24,9 @@
 #include <glib.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <libgviewer/libgviewer.h>
-#include <libgviewer/gvtypes.h>
-#include <libgviewer/fileops.h>
+#include <intviewer/libgviewer.h>
+#include <intviewer/gvtypes.h>
+#include <intviewer/fileops.h>
 
 void usage()
 {
diff --git a/tests/intviewer/imagerenderer.cc b/tests/intviewer/imagerenderer.cc
index deb60a7..ecf1509 100644
--- a/tests/intviewer/imagerenderer.cc
+++ b/tests/intviewer/imagerenderer.cc
@@ -29,7 +29,7 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 
-#include <libgviewer/libgviewer.h>
+#include <intviewer/libgviewer.h>
 
 static gchar *filename = NULL;
 static gboolean best_fit = TRUE;
diff --git a/tests/intviewer/inputmodes.cc b/tests/intviewer/inputmodes.cc
index c11adc3..f581a41 100644
--- a/tests/intviewer/inputmodes.cc
+++ b/tests/intviewer/inputmodes.cc
@@ -24,10 +24,10 @@
 #include <glib.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <libgviewer/libgviewer.h>
-#include <libgviewer/gvtypes.h>
-#include <libgviewer/fileops.h>
-#include <libgviewer/inputmodes.h>
+#include <intviewer/libgviewer.h>
+#include <intviewer/gvtypes.h>
+#include <intviewer/fileops.h>
+#include <intviewer/inputmodes.h>
 
 static offset_type start;
 static offset_type end;
diff --git a/tests/intviewer/search_dlg_test.cc b/tests/intviewer/search_dlg_test.cc
index 55409d5..9d63797 100644
--- a/tests/intviewer/search_dlg_test.cc
+++ b/tests/intviewer/search_dlg_test.cc
@@ -33,7 +33,7 @@
 
 #include <config.h>
 
-#include <libgviewer/libgviewer.h>
+#include <intviewer/libgviewer.h>
 
 
 int main(int argc, char *argv[])
diff --git a/tests/intviewer/textrenderer.cc b/tests/intviewer/textrenderer.cc
index c0f51e0..003fb5f 100644
--- a/tests/intviewer/textrenderer.cc
+++ b/tests/intviewer/textrenderer.cc
@@ -29,7 +29,7 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 
-#include <libgviewer/libgviewer.h>
+#include <intviewer/libgviewer.h>
 
 static gchar *filename = NULL;
 static gchar *encoding = NULL;
diff --git a/tests/intviewer/viewerwidget.cc b/tests/intviewer/viewerwidget.cc
index 4353f21..32ad542 100644
--- a/tests/intviewer/viewerwidget.cc
+++ b/tests/intviewer/viewerwidget.cc
@@ -29,7 +29,7 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 
-#include <libgviewer/libgviewer.h>
+#include <intviewer/libgviewer.h>
 
 static gchar *filename = NULL;
 static gchar *encoding = NULL;
diff --git a/tests/intviewer/viewerwindow.cc b/tests/intviewer/viewerwindow.cc
index 9360d95..b2bef29 100644
--- a/tests/intviewer/viewerwindow.cc
+++ b/tests/intviewer/viewerwindow.cc
@@ -32,7 +32,7 @@
 
 #include <config.h>
 
-#include <libgviewer/libgviewer.h>
+#include <intviewer/libgviewer.h>
 #include <libgnomeui/gnome-ui-init.h>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]