Skip to content

Commit

Permalink
build: Use env instead of TestEnvironment key
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
ebassi committed Jan 2, 2015
1 parent 847e3a2 commit 96c6c03
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions build/autotools/glib-tap.mk
Expand Up @@ -127,8 +127,7 @@ installed_test_meta_DATA = $(installed_testcases:=.test)
%.test: %$(EXEEXT) Makefile
$(AM_V_GEN) (echo '[Test]' > $@.tmp; \
echo 'Type=session' >> $@.tmp; \
echo 'TestEnvironment=G_ENABLE_DIAGNOSTIC=0;CLUTTER_ENABLE_DIAGNOSTIC=0;' >> $@.tmp; \
echo 'Exec=$(installed_testdir)/$<' >> $@.tmp; \
echo 'Exec=env G_ENABLE_DIAGNOSTIC=0 CLUTTER_ENABLE_DIAGNOSTIC=0 $(installed_testdir)/$<' >> $@.tmp; \
mv $@.tmp $@)

CLEANFILES += $(installed_test_meta_DATA)
Expand Down

0 comments on commit 96c6c03

Please sign in to comment.