luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-23 10:42:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert the test env thing

Browse Source 
...not needed for now. Setting the env.vars from the testcase itself.
This commit is contained in:
Matthias Clasen 2010-04-14 17:41:58 -04:00
parent 0b1b1582b8
commit cd4b67eb94
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.decl
View File

@ -7,14 +7,13 @@ GTESTER_REPORT = $(top_builddir)/glib/gtester-report # for the GLIB package
# initialize variables for unconditional += appending # initialize variables for unconditional += appending
EXTRA_DIST = EXTRA_DIST =
TEST_PROGS = TEST_PROGS =
TESTS_ENVIRONMENT =
### testing rules ### testing rules
# test: run all tests in cwd and subdirs # test: run all tests in cwd and subdirs
test: ${TEST_PROGS} test: ${TEST_PROGS}
if OS_UNIX if OS_UNIX
@test -z "${TEST_PROGS}" || env ${TESTS_ENVIRONMENT} ${GTESTER} --verbose ${TEST_PROGS} @test -z "${TEST_PROGS}" || ${GTESTER} --verbose ${TEST_PROGS}
@ for subdir in $(SUBDIRS) . ; do \ @ for subdir in $(SUBDIRS) . ; do \
test "$$subdir" = "." -o "$$subdir" = "po" || \ test "$$subdir" = "." -o "$$subdir" = "po" || \
( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \ ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \

3
gio/tests/Makefile.am
View File

@ -16,7 +16,6 @@ progs_ldadd = \
$(top_builddir)/gobject/libgobject-2.0.la \ $(top_builddir)/gobject/libgobject-2.0.la \
$(top_builddir)/gio/libgio-2.0.la $(top_builddir)/gio/libgio-2.0.la
TESTS_ENVIRONMENT += GSETTINGS_SCHEMA_DIR=. GSETTINGS_MEMORY_BACKEND_STORE=./store
TEST_PROGS += \ TEST_PROGS += \
memory-input-stream \ memory-input-stream \
memory-output-stream \ memory-output-stream \
@ -137,6 +136,8 @@ contexts_LDADD = $(progs_ldadd) \
gsettings_SOURCES = gsettings.c gschemas.compiled gsettings_SOURCES = gsettings.c gschemas.compiled
gsettings_LDADD = $(progs_ldadd) gsettings_LDADD = $(progs_ldadd)
EXTRA_DIST = org.gtk.test.gschema
BUILT_SOURCES = gschemas.compiled BUILT_SOURCES = gschemas.compiled
gschemas.compiled: *.gschema gschemas.compiled: *.gschema