dia r4106 - in trunk: . lib tests

[hans svn gnome org]

Author: hans
Date: Sat Aug  9 13:39:56 2008
New Revision: 4106
URL: http://svn.gnome.org/viewvc/dia?rev=4106&view=rev

Log:
2008-08-09  Hans Breuer  <hans breuer org>

	* tests/Makefile.am : start of unit test usage on *NIX

	* lib/Makefile.am : add libdia_la_LIBADD = $(GTK_LIBS)
	fixing bug #545450
	* lib/newgroup.c : disable call to diagram_unselect_objects() on *NIX
	as well, it collides with --no-undefined and libdia use in unit-test


Modified:
   trunk/ChangeLog
   trunk/lib/Makefile.am
   trunk/lib/newgroup.c
   trunk/tests/Makefile.am

Modified: trunk/lib/Makefile.am
==============================================================================
--- trunk/lib/Makefile.am	(original)
+++ trunk/lib/Makefile.am	Sat Aug  9 13:39:56 2008
@@ -176,6 +176,7 @@
 #		render.c 
 
 libdia_la_LDFLAGS = -avoid-version
+libdia_la_LIBADD = $(GTK_LIBS)
 
 AM_CPPFLAGS = \
 	$(LIBART_CFLAGS) \

Modified: trunk/lib/newgroup.c
==============================================================================
--- trunk/lib/newgroup.c	(original)
+++ trunk/lib/newgroup.c	Sat Aug  9 13:39:56 2008
@@ -287,7 +287,7 @@
 	/* Remove the group object that stayed at the start of the list,
 	   leaving only the children */
 	children = g_list_remove_link(children, children);
-#ifndef G_OS_WIN32 /* this introduces a crircular dependency, does not work on win32 and is bad style everywhere */
+#if 0 /* this introduces a crircular dependency, does not work on win32 and is bad style everywhere */
 	diagram_unselect_objects(layer_get_parent_diagram(layer), children);
 #else
 	g_warning ("used to call diagram_unselect_objects()");

Modified: trunk/tests/Makefile.am
==============================================================================
--- trunk/tests/Makefile.am	(original)
+++ trunk/tests/Makefile.am	Sat Aug  9 13:39:56 2008
@@ -4,3 +4,29 @@
 	for DIR in $(SUBDIRS); do \
 		cd $$DIR && $(MAKE) tests; \
 	done
+
+# where do i get GTESTER?
+#test: $(TEST_PROGS)
+#	@test -z "${TEST_PROGS}" || ${GTESTER} --verbose ${TEST_PROGS}
+
+test: $(TEST_PROGS)
+	./objects ../objects//
+
+# rum make test as part of make check
+check-local: test
+
+INCLUDES = -g -I$(top_srcdir) -I$(top_srcdir)/lib $(GTK_CFLAGS)
+
+noinst_PROGRAMS = $(TEST_PROGS)
+progs_ldadd = $(top_builddir)/lib/libdia.la $(GTK_LIBS)
+
+
+
+TEST_PROGS = boundingbox
+boundingbox_SOURCES = test-boundingbox.c
+boundingbox_LDADD = $(progs_ldadd)
+
+TEST_PROGS += objects
+objects_SOURCES = test-objects.c
+objects_LDADD = $(progs_ldadd)
+