brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: Use env instead of TestEnvironment key

Browse Source 
We rely on having the DISPLAY environment variable set, otherwise we
default to skipping all tests automatically. The TestEnvironment key
inside the installed test launcher keyfile replaces the whole
environment, instead of just adding to it like the TESTS_ENVIRONMENT
automake variable.
This commit is contained in:
Emmanuele Bassi 2015-01-02 12:16:57 +00:00
parent 847e3a2c55
commit 96c6c03474
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/autotools/glib-tap.mk
View File

@ -127,8 +127,7 @@ installed_test_meta_DATA = $(installed_testcases:=.test)
%.test: %$(EXEEXT) Makefile %.test: %$(EXEEXT) Makefile
$(AM_V_GEN) (echo '[Test]' > $@.tmp; \ $(AM_V_GEN) (echo '[Test]' > $@.tmp; \
echo 'Type=session' >> $@.tmp; \ echo 'Type=session' >> $@.tmp; \
echo 'TestEnvironment=G_ENABLE_DIAGNOSTIC=0;CLUTTER_ENABLE_DIAGNOSTIC=0;' >> $@.tmp; \ echo 'Exec=env G_ENABLE_DIAGNOSTIC=0 CLUTTER_ENABLE_DIAGNOSTIC=0 $(installed_testdir)/$<' >> $@.tmp; \
echo 'Exec=$(installed_testdir)/$<' >> $@.tmp; \
mv $@.tmp $@) mv $@.tmp $@)
CLEANFILES += $(installed_test_meta_DATA) CLEANFILES += $(installed_test_meta_DATA)