-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/glib -I$(top_srcdir)/gmodule @GLIB_DEBUG_FLAGS@
+SUBDIRS=gobject refcount
+
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/glib -I$(top_srcdir)/gmodule $(GLIB_DEBUG_FLAGS)
EFENCE=
-libglib = $(top_builddir)/glib/libglib-1.3.la
-libgthread = $(top_builddir)/gthread/libgthread-1.3.la
-libgmodule = $(top_builddir)/gmodule/libgmodule-1.3.la
-libgobject = $(top_builddir)/gobject/libgobject-1.3.la
+libglib = $(top_builddir)/glib/libglib-2.0.la
+libgthread = $(top_builddir)/gthread/libgthread-2.0.la
+libgmodule = $(top_builddir)/gmodule/libgmodule-2.0.la
+libgobject = $(top_builddir)/gobject/libgobject-2.0.la
if PLATFORM_WIN32
libadd_libgmodule = $(libgmodule)
module-test.exp: module-test.o
dlltool --output-exp module-test.exp module-test.o
+
+spawn_test_win32_gui = spawn-test-win32-gui
+
+spawn_test_win32_gui_LDFLAGS = -mwindows
+
endif
EXTRA_DIST = \
$(test_scripts) \
makefile.msc.in \
- makefile.mingw.in \
casefold.txt \
casemap.txt \
gen-casefold-txt.pl \
utf8.txt
BUILT_EXTRA_DIST = \
- makefile.mingw \
makefile.msc
if HAVE_CXX
CXX_TEST = cxx-test
-cxx_test_LDADD = $(progs_LDADD)
+cxx_test_LDADD = $(progs_ldadd)
cxx_test_SOURCES = cxx-test.C
else
CXX_TEST =
if ENABLE_TIMELOOP
timeloop = timeloop timeloop-closure
endif
-noinst_PROGRAMS = testglib patterntest testgdate testgdateparser unicode-normalize unicode-collate $(timeloop)
+noinst_PROGRAMS = testglib testgdate testgdateparser unicode-normalize unicode-collate $(timeloop) errorcheck-mutex-test
testglib_LDADD = $(libglib)
patterntest_LDADD = $(libglib)
testgdate_LDADD = $(libglib)
testgdateparser_LDADD = $(libglib)
unicode_normalize_LDADD = $(libglib)
-unicode_collate_LDADD = $(libglib)
+errorcheck_mutex_test_LDADD = $(libglib) $(libgthread)
if ENABLE_TIMELOOP
timeloop_LDADD = $(libglib)
timeloop_closure_LDADD = $(libglib) $(libgobject)
endif
test_programs = \
+ atomic-test \
array-test \
+ base64-test \
$(CXX_TEST) \
+ child-test \
+ completion-test \
+ convert-test \
date-test \
dirname-test \
+ file-test \
+ env-test \
gio-test \
hash-test \
iochannel-test \
+ keyfile-test \
list-test \
mainloop-test \
+ mapping-test \
+ markup-escape-test \
module-test \
node-test \
+ option-test \
+ patterntest \
+ printf-test \
queue-test \
+ asyncqueue-test \
qsort-test \
rand-test \
relation-test \
shell-test \
slist-test \
+ slice-test \
+ slice-color \
spawn-test \
+ $(spawn_test_win32_gui) \
strfunc-test \
string-test \
strtod-test \
type-test \
unicode-caseconv \
unicode-encoding \
+ utf8-validate \
+ utf8-pointer \
uri-test
-test_scripts = run-markup-tests.sh
+test_scripts = run-markup-tests.sh run-collate-tests.sh run-bookmark-test.sh
-test_script_support_programs = markup-test
+test_script_support_programs = markup-test unicode-collate bookmarkfile-test
check_PROGRAMS = $(test_programs) $(test_script_support_programs)
TESTS = $(test_programs) $(test_scripts)
TESTS_ENVIRONMENT = srcdir=$(srcdir) \
- LIBCHARSET_ALIAS_DIR=$(top_builddir)/glib/libcharset
-
-progs_LDADD = $(EFENCE) $(libglib) $(EFENCE)
-thread_LDADD = $(libgthread) @G_THREAD_LIBS@ $(progs_LDADD)
-module_LDADD = $(libgmodule) @G_MODULE_LIBS@ $(progs_LDADD)
-
-array_test_LDADD = $(progs_LDADD)
-date_test_LDADD = $(progs_LDADD)
-dirname_test_LDADD = $(progs_LDADD)
-gio_test_LDADD = $(progs_LDADD)
-hash_test_LDADD = $(progs_LDADD)
-iochannel_test_LDADD = $(progs_LDADD)
-list_test_LDADD = $(progs_LDADD)
-mainloop_test_LDADD = $(thread_LDADD)
-markup_test_LDADD = $(progs_LDADD)
-module_test_LDADD = $(module_LDADD) $(module_test_exp)
-module_test_LDFLAGS = @G_MODULE_LDFLAGS@
-node_test_LDADD = $(progs_LDADD)
-queue_test_LDADD = $(progs_LDADD)
-qsort_test_LDADD = $(progs_LDADD)
-rand_test_LDADD = $(progs_LDADD)
-relation_test_LDADD = $(progs_LDADD)
-shell_test_LDADD = $(progs_LDADD)
-slist_test_LDADD = $(progs_LDADD)
-spawn_test_LDADD = $(progs_LDADD)
-strfunc_test_LDADD = $(progs_LDADD)
-string_test_LDADD = $(progs_LDADD)
-strtod_test_LDADD = $(progs_LDADD) -lm
-thread_test_LDADD = $(thread_LDADD)
-threadpool_test_LDADD = $(thread_LDADD)
-tree_test_LDADD = $(progs_LDADD)
-type_test_LDADD = $(progs_LDADD)
-unicode_encoding_LDADD = $(progs_LDADD)
-unicode_caseconv_LDADD = $(progs_LDADD)
-uri_test_LDADD = $(progs_LDADD)
+ LIBCHARSET_ALIAS_DIR=$(top_builddir)/glib/libcharset \
+ MALLOC_CHECK_=2 \
+ MALLOC_PERTURB_=$$(($$RANDOM % 256))
+
+progs_ldadd = $(EFENCE) $(libglib) $(EFENCE)
+thread_ldadd = $(libgthread) $(G_THREAD_LIBS) $(progs_ldadd)
+module_ldadd = $(libgmodule) $(G_MODULE_LIBS) $(progs_ldadd)
+
+atomic_test_LDADD = $(progs_ldadd)
+array_test_LDADD = $(progs_ldadd)
+base64_test_LDADD = $(progs_ldadd)
+bookmarkfile_test_LDADD = $(progs_ldadd)
+child_test_LDADD = $(thread_ldadd)
+completion_test_LDADD = $(progs_ldadd)
+convert_test_LDADD = $(progs_ldadd)
+date_test_LDADD = $(progs_ldadd)
+dirname_test_LDADD = $(progs_ldadd)
+file_test_LDADD = $(progs_ldadd)
+env_test_LDADD = $(progs_ldadd)
+gio_test_LDADD = $(progs_ldadd)
+hash_test_LDADD = $(progs_ldadd)
+iochannel_test_LDADD = $(progs_ldadd)
+keyfile_test_LDADD = $(progs_ldadd)
+list_test_LDADD = $(progs_ldadd)
+mainloop_test_LDADD = $(thread_ldadd)
+markup_test_LDADD = $(progs_ldadd)
+mapping_test_LDADD = $(progs_ldadd)
+markup_escape_test_LDADD = $(progs_ldadd)
+module_test_LDADD = $(module_ldadd) $(module_test_exp)
+module_test_LDFLAGS = $(G_MODULE_LDFLAGS)
+node_test_LDADD = $(progs_ldadd)
+option_test_LDADD = $(progs_ldadd)
+printf_test_LDADD = $(progs_ldadd)
+queue_test_LDADD = $(progs_ldadd)
+asyncqueue_test_LDADD = $(thread_ldadd)
+qsort_test_LDADD = $(progs_ldadd)
+rand_test_LDADD = $(progs_ldadd)
+relation_test_LDADD = $(progs_ldadd)
+shell_test_LDADD = $(progs_ldadd)
+slist_test_LDADD = $(progs_ldadd)
+slice_test_SOURCES = slice-test.c memchunks.c
+slice_test_LDADD = $(thread_ldadd)
+slice_color_SOURCES = slice-color.c memchunks.c
+slice_color_LDADD = $(thread_ldadd)
+spawn_test_LDADD = $(progs_ldadd)
+strfunc_test_LDADD = $(progs_ldadd)
+string_test_LDADD = $(progs_ldadd)
+strtod_test_LDADD = $(progs_ldadd) -lm
+thread_test_LDADD = $(thread_ldadd)
+threadpool_test_LDADD = $(thread_ldadd)
+tree_test_LDADD = $(progs_ldadd)
+type_test_LDADD = $(progs_ldadd)
+unicode_encoding_LDADD = $(progs_ldadd)
+unicode_caseconv_LDADD = $(progs_ldadd)
+unicode_collate_LDADD = $(progs_ldadd)
+utf8_validate_LDADD = $(progs_ldadd)
+utf8_pointer_LDADD = $(progs_ldadd)
+uri_test_LDADD = $(progs_ldadd)
lib_LTLIBRARIES = libmoduletestplugin_a.la libmoduletestplugin_b.la
:
libmoduletestplugin_a_la_SOURCES = libmoduletestplugin_a.c
-libmoduletestplugin_a_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module $(no_undefined) -rpath $(libdir)
-libmoduletestplugin_a_la_LIBADD = @G_MODULE_LIBS@ $(libadd_libgmodule) $(libadd_libglib)
+libmoduletestplugin_a_la_LDFLAGS = $(G_MODULE_LDFLAGS) -avoid-version -module $(no_undefined) -rpath $(libdir)
+libmoduletestplugin_a_la_LIBADD = $(G_MODULE_LIBS) $(libadd_libgmodule) $(libadd_libglib)
libmoduletestplugin_b_la_SOURCES = libmoduletestplugin_b.c
-libmoduletestplugin_b_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module $(no_undefined) -rpath $(libdir)
-libmoduletestplugin_b_la_LIBADD = @G_MODULE_LIBS@ $(libadd_libgmodule) $(libadd_libglib)
-
-makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/tests/makefile.mingw.in
- cd $(top_builddir) && CONFIG_FILES=tests/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-makefile.msc: $(top_builddir)/config.status $(top_srcdir)/tests/makefile.msc.in
- cd $(top_builddir) && CONFIG_FILES=tests/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+libmoduletestplugin_b_la_LDFLAGS = $(G_MODULE_LDFLAGS) -avoid-version -module $(no_undefined) -rpath $(libdir)
+libmoduletestplugin_b_la_LIBADD = $(G_MODULE_LIBS) $(libadd_libgmodule) $(libadd_libglib)
dist-hook: $(BUILT_EXTRA_DIST)
files='$(BUILT_EXTRA_DIST)'; \
cp $$d/$$f $(distdir) || exit 1; done
mkdir $(distdir)/markups; \
for f in $(srcdir)/markups/* ; do \
- cp $$f $(distdir)/markups; \
- done
+ cp $$f $(distdir)/markups; done
+ mkdir $(distdir)/collate; \
+ for f in $(srcdir)/collate/* ; do \
+ if test -f $$f; then cp $$f $(distdir)/collate; fi; done
+ mkdir $(distdir)/bookmarks; \
+ for f in $(srcdir)/bookmarks/* ; do \
+ cp $$f $(distdir)/bookmarks; done
+
+DISTCLEANFILES = iochannel-test-outfile \
+ file-test-get-contents \
+ maptest \
+ mapchild \
+ collate.out