initialize automake variables EXTRA_DIST and TEST_PROGS for unconditional

[platform/upstream/glib.git] / tests / Makefile.am

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5128f60..acc7570 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,6 +1,14 @@
+include $(top_srcdir)/Makefile.decl
+
 SUBDIRS=gobject refcount
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/glib -I$(top_srcdir)/gmodule $(GLIB_DEBUG_FLAGS)
+if ENABLE_REGEX
+enable_regex = -DENABLE_REGEX
+else
+enable_regex =
+endif
+
+INCLUDES = -g -I$(top_srcdir) -I$(top_srcdir)/glib -I$(top_srcdir)/gmodule $(GLIB_DEBUG_FLAGS) $(enable_regex)
 
 EFENCE=
 
@@ -9,9 +17,9 @@ 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)
 libadd_libglib = $(libglib)
+if PLATFORM_WIN32
 no_undefined = -no-undefined
 
 module_test_exp = module-test.exp
@@ -25,7 +33,7 @@ spawn_test_win32_gui_LDFLAGS = -mwindows
 
 endif
 
-EXTRA_DIST =                                   \
+EXTRA_DIST +=                                  \
        $(test_scripts)                         \
        makefile.msc.in                         \
        casefold.txt                            \
@@ -33,7 +41,8 @@ EXTRA_DIST =                                  \
        gen-casefold-txt.pl                     \
        gen-casemap-txt.pl                      \
        iochannel-test-infile                   \
-       utf8.txt
+       utf8.txt                                \
+       timeloop-basic.c                
 
 BUILT_EXTRA_DIST =                             \
        makefile.msc
@@ -65,6 +74,7 @@ test_programs =                                       \
        atomic-test                             \
        array-test                              \
        base64-test                             \
+       bit-test                                \
        $(CXX_TEST)                             \
        child-test                              \
        completion-test                         \
@@ -83,6 +93,7 @@ test_programs =                                       \
        markup-escape-test                      \
        module-test                             \
        node-test                               \
+       onceinit                                \
        option-test                             \
        patterntest                             \
        printf-test                             \
@@ -91,10 +102,13 @@ test_programs =                                    \
        qsort-test                              \
        rand-test                               \
        relation-test                           \
+       sequence-test                           \
        shell-test                              \
        slist-test                              \
        slice-test                              \
        slice-color                             \
+       slice-concurrent                        \
+       slice-threadinit                        \
        spawn-test                              \
        $(spawn_test_win32_gui)                 \
        strfunc-test                            \
@@ -109,7 +123,8 @@ test_programs =                                     \
        unicode-encoding                        \
        utf8-validate                           \
        utf8-pointer                            \
-       uri-test
+       uri-test                                \
+       regex-test
 
 test_scripts = run-markup-tests.sh run-collate-tests.sh run-bookmark-test.sh
 
@@ -121,7 +136,7 @@ TESTS = $(test_programs) $(test_scripts)
 TESTS_ENVIRONMENT = srcdir=$(srcdir) \
        LIBCHARSET_ALIAS_DIR=$(top_builddir)/glib/libcharset \
        MALLOC_CHECK_=2 \
-       MALLOC_PERTURB_=$$(($$RANDOM % 256))
+        MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256))
 
 progs_ldadd = $(EFENCE) $(libglib) $(EFENCE)
 thread_ldadd = $(libgthread) $(G_THREAD_LIBS) $(progs_ldadd)
@@ -130,6 +145,7 @@ module_ldadd = $(libgmodule) $(G_MODULE_LIBS) $(progs_ldadd)
 atomic_test_LDADD = $(progs_ldadd)
 array_test_LDADD = $(progs_ldadd)
 base64_test_LDADD = $(progs_ldadd)
+bit_test_LDADD = $(progs_ldadd)
 bookmarkfile_test_LDADD = $(progs_ldadd)
 child_test_LDADD = $(thread_ldadd)
 completion_test_LDADD = $(progs_ldadd)
@@ -150,6 +166,7 @@ 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)
+onceinit_LDADD = $(thread_ldadd)
 option_test_LDADD = $(progs_ldadd)
 printf_test_LDADD = $(progs_ldadd)
 queue_test_LDADD = $(progs_ldadd)
@@ -157,12 +174,17 @@ asyncqueue_test_LDADD = $(thread_ldadd)
 qsort_test_LDADD = $(progs_ldadd)
 rand_test_LDADD = $(progs_ldadd)
 relation_test_LDADD = $(progs_ldadd)
+sequence_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)
+slice_concurrent_SOURCES = slice-concurrent.c
+slice_concurrent_LDADD = $(thread_ldadd)
+slice_threadinit_SOURCES = slice-threadinit.c
+slice_threadinit_LDADD = $(thread_ldadd)
 spawn_test_LDADD = $(progs_ldadd)
 strfunc_test_LDADD = $(progs_ldadd)
 string_test_LDADD = $(progs_ldadd)
@@ -178,6 +200,7 @@ unicode_collate_LDADD = $(progs_ldadd)
 utf8_validate_LDADD = $(progs_ldadd)
 utf8_pointer_LDADD = $(progs_ldadd)
 uri_test_LDADD = $(progs_ldadd)
+regex_test_LDADD = $(progs_ldadd)
 
 lib_LTLIBRARIES = libmoduletestplugin_a.la libmoduletestplugin_b.la