GNOME.org
 

[glib] Simplify glib/glib/tests setup

commit f5f151cb85b217516ad375d085f379ec4ea97d88
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Feb 2 16:26:17 2013 -0500

    Simplify glib/glib/tests setup
    
    The Makefile.am was setting a ton of unnecessary things

 glib/tests/Makefile.am |  346 ++++++++++++------------------------------------
 1 files changed, 87 insertions(+), 259 deletions(-)
---
diff --git a/glib/tests/Makefile.am b/glib/tests/Makefile.am
index d4470e0..cbf90cd 100644
--- a/glib/tests/Makefile.am
+++ b/glib/tests/Makefile.am
@@ -1,294 +1,123 @@
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES = 				\
+AM_CPPFLAGS = 				\
 	-g 				\
 	$(glib_INCLUDES) 		\
 	-DG_LOG_DOMAIN=\"GLib\" 	\
 	-DSRCDIR=\""$(srcdir)"\"	\
 	$(GLIB_DEBUG_FLAGS)
 
-noinst_PROGRAMS = $(TEST_PROGS) test-spawn-echo
-progs_ldadd     = $(top_builddir)/glib/libglib-2.0.la 
-
-test_spawn_echo_SOURCES = test-spawn-echo.c
-test_spawn_echo_LDADD = $(progs_ldadd)
-
-TEST_PROGS       += testing
-testing_SOURCES	  = testing.c
-testing_LDADD	  = $(progs_ldadd)
-
-TEST_PROGS       	 += option-context
-option_context_SOURCES	  = option-context.c
-option_context_LDADD	  = $(progs_ldadd)
-
-TEST_PROGS       	 += option-argv0
-option_argv0_SOURCES	  = option-argv0.c
-option_argv0_LDADD	  = $(progs_ldadd)
-
-TEST_PROGS     	 += keyfile
-keyfile_SOURCES	  = keyfile.c
-keyfile_LDADD	  = $(progs_ldadd)
-
-TEST_PROGS        += fileutils
-fileutils_SOURCES  = fileutils.c
-fileutils_LDADD	   = $(progs_ldadd)
-
-TEST_PROGS          += test-printf
-test_printf_SOURCES  = test-printf.c
-test_printf_LDADD    = $(progs_ldadd) -lm
-
-TEST_PROGS        += protocol
-protocol_SOURCES   = protocol.c
-protocol_LDADD     = $(progs_ldadd)
-
-TEST_PROGS        += rand
-rand_SOURCES       = rand.c
-rand_LDADD         = $(progs_ldadd) -lm
-
-TEST_PROGS        += strfuncs
-strfuncs_SOURCES   = strfuncs.c
-strfuncs_LDADD	   = $(progs_ldadd) -lm
-
-TEST_PROGS        += string
-string_SOURCES     = string.c
-string_LDADD	   = $(progs_ldadd) -lm
-
-TEST_PROGS          += markup-parse
-markup_parse_LDADD   = $(progs_ldadd)
-
-TEST_PROGS          += markup-collect
-markup_collect_LDADD = $(progs_ldadd)
-
-TEST_PROGS         += markup-escape
-markup_escape_LDADD = $(progs_ldadd)
-
-TEST_PROGS               += markup-subparser
-markup_subparser_LDADD    = $(progs_ldadd)
-
-TEST_PROGS         += array-test
-array_test_LDADD    = $(progs_ldadd)
-
-TEST_PROGS         += bytes
-bytes_LDADD         = $(progs_ldadd)
-
-TEST_PROGS         += hostutils
-hostutils_LDADD     = $(progs_ldadd)
-
-TEST_PROGS         += gvariant
-gvariant_LDADD      = $(progs_ldadd)
-
-TEST_PROGS         += mem-overflow
-mem_overflow_LDADD  = $(progs_ldadd)
-
-TEST_PROGS              += utf8-performance
-utf8_performance_SOURCES = utf8-performance.c
-utf8_performance_LDADD   = $(progs_ldadd)
-
-TEST_PROGS         += utils
-utils_LDADD         = $(progs_ldadd)
-
-TEST_PROGS         += regex
-regex_LDADD         = $(progs_ldadd)
-
-TEST_PROGS         += base64
-base64_LDADD        = $(progs_ldadd)
-
-TEST_PROGS         += sequence
-sequence_LDADD      = $(progs_ldadd)
-
-TEST_PROGS         += scannerapi
-scannerapi_LDADD    = $(progs_ldadd)
-
-TEST_PROGS         += shell
-shell_LDADD         = $(progs_ldadd)
-
-TEST_PROGS         += collate
-collate_LDADD       = $(progs_ldadd)
-
-TEST_PROGS         += utf8-pointer
-utf8_pointer_LDADD  = $(progs_ldadd)
-
-TEST_PROGS         += utf8-validate
-utf8_validate_LDADD = $(progs_ldadd)
-
-TEST_PROGS         += utf8-misc
-utf8_misc_LDADD     = $(progs_ldadd)
-
-TEST_PROGS         += unicode
-unicode_LDADD     = $(progs_ldadd)
-
-TEST_PROGS         += checksum
-checksum_LDADD      = $(progs_ldadd)
-
-TEST_PROGS         += hmac
-hmac_LDADD          = $(progs_ldadd)
-
-TEST_PROGS         += hash
-hash_LDADD          = $(progs_ldadd)
-
-TEST_PROGS         += cache
-cache_LDADD         = $(progs_ldadd)
-
-TEST_PROGS         += date
-date_LDADD          = $(progs_ldadd)
-
-TEST_PROGS         += node
-node_LDADD          = $(progs_ldadd)
+LDADD = $(top_builddir)/glib/libglib-2.0.la -lm
+
+TEST_PROGS += 				\
+	array-test			\
+	asyncqueue			\
+	atomic				\
+	base64				\
+	bitlock				\
+	bookmarkfile			\
+	bytes				\
+	cache				\
+	checksum			\
+	collate				\
+	cond				\
+	convert				\
+	dataset				\
+	date				\
+	dir				\
+	environment			\
+	error				\
+	fileutils			\
+	gdatetime			\
+	gvariant			\
+	gwakeup				\
+	hash				\
+	hmac				\
+	hook				\
+	hostutils			\
+	keyfile				\
+	list				\
+	logging				\
+	mainloop			\
+	mappedfile			\
+	markup-parse			\
+	markup-collect			\
+	markup-escape			\
+	markup-subparser		\
+	mem-overflow			\
+	mutex				\
+	node				\
+	once				\
+	option-context			\
+	option-argv0			\
+	pattern				\
+	private				\
+	protocol			\
+	queue				\
+	rand				\
+	rec-mutex			\
+	regex				\
+	rwlock				\
+	scannerapi			\
+	sequence			\
+	shell				\
+	slice				\
+	slist				\
+	sort				\
+	spawn-multithreaded		\
+	spawn-singlethread		\
+	strfuncs			\
+	string				\
+	testing 			\
+	test-printf			\
+	thread				\
+	timeout				\
+	tree				\
+	utf8-performance		\
+	utf8-pointer			\
+	utf8-validate			\
+	utf8-misc			\
+	utils				\
+	unicode				\
+	uri				\
+	1bit-mutex			\
+	1bit-emufutex			\
+	642026				\
+	642026-ec
 
-TEST_PROGS         += convert
-convert_LDADD       = $(progs_ldadd)
-
-TEST_PROGS         += list
-list_LDADD          = $(progs_ldadd)
-
-TEST_PROGS         += slist
-slist_LDADD         = $(progs_ldadd)
-
-TEST_PROGS         += queue
-queue_LDADD         = $(progs_ldadd)
-
-TEST_PROGS         += tree
-tree_LDADD          = $(progs_ldadd)
-
-TEST_PROGS         += uri
-uri_LDADD           = $(progs_ldadd)
-
-TEST_PROGS         += dir
-dir_LDADD           = $(progs_ldadd)
-
-TEST_PROGS         += pattern
-pattern_LDADD       = $(progs_ldadd)
-
-TEST_PROGS         += logging
-logging_LDADD       = $(progs_ldadd)
-
-TEST_PROGS         += error
-error_LDADD         = $(progs_ldadd)
-
-TEST_PROGS         += bookmarkfile
-bookmarkfile_LDADD  = $(progs_ldadd)
-
-TEST_PROGS          += gdatetime
-gdatetime_SOURCES    = gdatetime.c
-gdatetime_LDADD      = $(progs_ldadd)
-
-TEST_PROGS          += timeout
-timeout_SOURCES      = timeout.c
-timeout_LDADD        = $(progs_ldadd)
-
-TEST_PROGS       += environment
-environment_LDADD = $(progs_ldadd)
-
-TEST_PROGS       += mappedfile
-mappedfile_LDADD  = $(progs_ldadd)
-
-TEST_PROGS    += dataset
-dataset_LDADD  = $(progs_ldadd)
-
-TEST_PROGS    += sort
-sort_LDADD     = $(progs_ldadd)
+noinst_PROGRAMS = $(TEST_PROGS) test-spawn-echo
 
-TEST_PROGS    += atomic
-atomic_CFLAGS  = $(INCLUDES)
+atomic_CFLAGS  = $(AM_CFLAGS)
 if HAVE_GCC
 atomic_CFLAGS += -Wstrict-aliasing=2
 endif
-atomic_LDADD = $(progs_ldadd)
-
-TEST_PROGS    += bitlock
-bitlock_LDADD  = $(progs_ldadd)
-
-TEST_PROGS    += mutex
-mutex_LDADD    = $(progs_ldadd)
-
-TEST_PROGS      += rec-mutex
-rec_mutex_LDADD  = $(progs_ldadd)
 
-TEST_PROGS      += rwlock
-rwlock_LDADD     = $(progs_ldadd)
-
-TEST_PROGS      += once
-once_LDADD       = $(progs_ldadd)
-
-TEST_PROGS      += cond
-cond_LDADD       = $(progs_ldadd)
-
-TEST_PROGS      += thread
-thread_LDADD     = $(progs_ldadd)
-
-TEST_PROGS      += slice
-slice_LDADD      = $(progs_ldadd)
-
-TEST_PROGS      += hook
-hook_LDADD       = $(progs_ldadd)
-
-TEST_PROGS      += mainloop
-mainloop_LDADD   = $(progs_ldadd)
-
-TEST_PROGS      += private
-private_LDADD    = $(progs_ldadd)
-
-TEST_PROGS       += asyncqueue
-asyncqueue_LDADD  = $(progs_ldadd)
-
-TEST_PROGS       += 1bit-mutex
-1bit_mutex_LDADD  = $(progs_ldadd)
-
-TEST_PROGS       += 642026
-642026_LDADD      = $(progs_ldadd)
-
-TEST_PROGS       += 642026-ec
 642026_ec_SOURCES = 642026.c
-642026_ec_LDADD   = $(progs_ldadd)
-642026_ec_CFLAGS  = -DG_ERRORCHECK_MUTEXES
+642026_ec_CFLAGS = -DG_ERRORCHECK_MUTEXES
 
-TEST_PROGS            += 1bit-emufutex
 1bit_emufutex_SOURCES  = 1bit-mutex.c
-1bit_emufutex_CFLAGS   = -DTEST_EMULATED_FUTEX
-1bit_emufutex_LDADD    = $(progs_ldadd)
-
-TEST_PROGS += spawn-multithreaded
-spawn_multithreaded_SOURCES = spawn-multithreaded.c
-spawn_multithreaded_LDADD    = $(progs_ldadd)
-
-TEST_PROGS += spawn-singlethread
-spawn_singlethread_SOURCES = spawn-singlethread.c
-spawn_singlethread_LDADD    = $(progs_ldadd)
+1bit_emufutex_CFLAGS = $(AM_CFLAGS) -DTEST_EMULATED_FUTEX
 
-TEST_PROGS += gwakeup
 gwakeup_SOURCES = gwakeuptest.c ../../glib/gwakeup.c
-gwakeup_LDADD    = $(progs_ldadd)
 
 if HAVE_EVENTFD
 TEST_PROGS += gwakeup-fallback
 gwakeup_fallback_SOURCES = gwakeuptest.c ../../glib/gwakeup.c
 gwakeup_fallback_CFLAGS = $(AM_CFLAGS) -DTEST_EVENTFD_FALLBACK
-gwakeup_fallback_LDADD    = $(progs_ldadd)
 endif
 
 if OS_UNIX
-private_LDFLAGS = -pthread
-
-TEST_PROGS += unix-multithreaded
-unix_multithreaded_SOURCES = $(top_srcdir)/glib/tests/unix.c
-unix_multithreaded_CFLAGS   = -DTEST_THREADED
-unix_multithreaded_LDADD    = $(progs_ldadd)
-
-TEST_PROGS    += unix
-unix_LDADD  = $(progs_ldadd)
 
-TEST_PROGS    += unix-nothreads
-unix_nothreads_SOURCES = unix.c
-unix_nothreads_LDADD  = $(progs_ldadd)
-
-TEST_PROGS      += include
-include_LDADD    = $(progs_ldadd)
+TEST_PROGS += unix
+TEST_PROGS += include
 
 # some testing of gtester functionality
-XMLLINT=xmllint
+XMLLINT = xmllint
+
 gtester-xmllint-check: # check testreport xml with xmllint if present
 	${GTESTER} -k --quiet -o tmpsample.xml --test-arg=--gtester-selftest ${GTESTER}
 	${XMLLINT} --version 2>/dev/null; test "$$?" != 0 || ${XMLLINT} --noout tmpsample.xml
+
 check-am: gtester-xmllint-check
 
 endif
@@ -311,4 +140,3 @@ dist-hook:
 	mkdir $(distdir)/bookmarks;		\
 	for f in $(srcdir)/bookmarks/* ; do 	\
 	  cp $$f $(distdir)/bookmarks; done
-
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]