From da478acd3c948536cd117e4347fcc554d93a7dc8 Mon Sep 17 00:00:00 2001 From: Ryan Lortie Date: Tue, 28 May 2013 17:48:06 -0400 Subject: [PATCH] Remove G_TEST_DATA= from installed .test files This is no longer needed with the new test data file finding stuff. https://bugzilla.gnome.org/show_bug.cgi?id=549783 --- gio/tests/Makefile.am | 2 +- glib/tests/Makefile.am | 2 +- gobject/tests/Makefile.am | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am index 20cae5b3a..04866bfcd 100644 --- a/gio/tests/Makefile.am +++ b/gio/tests/Makefile.am @@ -530,7 +530,7 @@ testmeta_DATA = $(filter-out $(xfail_tests) $(developer_only_tests),$(test_progs %.test: %$(EXEEXT) Makefile $(AM_V_GEN) (echo '[Test]' > $@.tmp; \ echo 'Type=session' >> $@.tmp; \ - echo 'Exec=env G_TEST_DATA=$(pkglibexecdir)/installed-tests $(pkglibexecdir)/installed-tests/$<' >> $@.tmp; \ + echo 'Exec=$(pkglibexecdir)/installed-tests/$<' >> $@.tmp; \ mv $@.tmp $@) %.desktop.insttest: %.desktop diff --git a/glib/tests/Makefile.am b/glib/tests/Makefile.am index 0ed7d21f4..5ee09dd79 100644 --- a/glib/tests/Makefile.am +++ b/glib/tests/Makefile.am @@ -178,7 +178,7 @@ endif %.test: %$(EXEEXT) Makefile $(AM_V_GEN) (echo '[Test]' > $@.tmp; \ echo 'Type=session' >> $@.tmp; \ - echo 'Exec=env G_TEST_DATA=$(pkglibexecdir)/installed-tests $(pkglibexecdir)/installed-tests/$<' >> $@.tmp; \ + echo 'Exec=$(pkglibexecdir)/installed-tests/$<' >> $@.tmp; \ mv $@.tmp $@) atomic_CFLAGS = $(AM_CFLAGS) diff --git a/gobject/tests/Makefile.am b/gobject/tests/Makefile.am index 390f41af8..988a13900 100644 --- a/gobject/tests/Makefile.am +++ b/gobject/tests/Makefile.am @@ -59,7 +59,7 @@ testmeta_DATA = $(TEST_PROGS:=.test) %.test: %$(EXEEXT) Makefile $(AM_V_GEN) (echo '[Test]' > $@.tmp; \ echo 'Type=session' >> $@.tmp; \ - echo 'Exec=env G_TEST_DATA=$(pkglibexecdir)/installed-tests $(pkglibexecdir)/installed-tests/$<' >> $@.tmp; \ + echo 'Exec=$(pkglibexecdir)/installed-tests/$<' >> $@.tmp; \ mv $@.tmp $@)