mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-01-11 23:16:14 +01:00
Move a pair of gobject tests to tests/gobject/
testgobject.c and timeloop-closure.c are the only two tests in the toplevel tests/ directory that depend on gobject, so move them to tests/gobject/ along with the other gobject tests. Both of these were in noinst_PROGRAMS and not TESTS, so keep them that way when we move them.
This commit is contained in:
parent
a114e98d09
commit
d7b3e558cf
@ -60,7 +60,7 @@ CXX_TEST =
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
if ENABLE_TIMELOOP
|
if ENABLE_TIMELOOP
|
||||||
timeloop = timeloop timeloop-closure
|
timeloop = timeloop
|
||||||
endif
|
endif
|
||||||
noinst_PROGRAMS = $(TEST_PROGS) \
|
noinst_PROGRAMS = $(TEST_PROGS) \
|
||||||
testgdate \
|
testgdate \
|
||||||
@ -69,8 +69,7 @@ noinst_PROGRAMS = $(TEST_PROGS) \
|
|||||||
unicode-collate \
|
unicode-collate \
|
||||||
$(timeloop) \
|
$(timeloop) \
|
||||||
assert-msg-test \
|
assert-msg-test \
|
||||||
datetime \
|
datetime
|
||||||
testgobject
|
|
||||||
|
|
||||||
TEST_PROGS += testglib
|
TEST_PROGS += testglib
|
||||||
testglib_SOURCES = testglib.c
|
testglib_SOURCES = testglib.c
|
||||||
@ -84,10 +83,8 @@ unicode_collate_LDADD = $(libglib)
|
|||||||
assert_msg_test_LDADD = $(libglib)
|
assert_msg_test_LDADD = $(libglib)
|
||||||
if ENABLE_TIMELOOP
|
if ENABLE_TIMELOOP
|
||||||
timeloop_LDADD = $(libglib)
|
timeloop_LDADD = $(libglib)
|
||||||
timeloop_closure_LDADD = $(libglib) $(libgobject)
|
|
||||||
endif
|
endif
|
||||||
datetime_LDADD = $(libglib)
|
datetime_LDADD = $(libglib)
|
||||||
testgobject_LDADD = $(libglib) $(libgobject)
|
|
||||||
|
|
||||||
test_programs = \
|
test_programs = \
|
||||||
atomic-test \
|
atomic-test \
|
||||||
|
@ -70,7 +70,11 @@ performance_programs = \
|
|||||||
performance_LDADD = $(libgobject) $(libgthread)
|
performance_LDADD = $(libgobject) $(libgthread)
|
||||||
performance_threaded_LDADD = $(libgobject) $(libgthread)
|
performance_threaded_LDADD = $(libgobject) $(libgthread)
|
||||||
check_PROGRAMS = $(test_programs)
|
check_PROGRAMS = $(test_programs)
|
||||||
noinst_PROGRAMS = $(performance_programs)
|
noinst_PROGRAMS = $(performance_programs) testgobject
|
||||||
|
|
||||||
|
if ENABLE_TIMELOOP
|
||||||
|
noinst_PROGRAMS += timeloop-closure
|
||||||
|
endif
|
||||||
|
|
||||||
TESTS = $(test_programs) $(performance_programs)
|
TESTS = $(test_programs) $(performance_programs)
|
||||||
TESTS_ENVIRONMENT = srcdir=$(srcdir) \
|
TESTS_ENVIRONMENT = srcdir=$(srcdir) \
|
||||||
|
Loading…
Reference in New Issue
Block a user