]> git.ipfire.org Git - thirdparty/vala.git/commitdiff
tests: Actually make the "version check" tests work c55121b4346c8c935018886337cd0f39de37c59b
authorRico Tzschichholz <ricotz@ubuntu.com>
Thu, 16 Apr 2020 14:38:55 +0000 (16:38 +0200)
committerRico Tzschichholz <ricotz@ubuntu.com>
Thu, 16 Apr 2020 14:39:42 +0000 (16:39 +0200)
tests/Makefile.am

index 14e89114a1a61dfe95db76d9ab8ccb7b48997286..0593bef60a8860cd8ce1674c04e60da8ba7d09e4 100644 (file)
@@ -1030,8 +1030,8 @@ if HAVE_LINUX
 endif
        @EXEEXT=$(EXEEXT) CFLAGS='$(CFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' TEST_CFLAGS='$(TEST_CFLAGS)' CC='$(CC)' \
                VALAFLAGS="--enable-experimental-non-null" $(srcdir)/testrunner.sh $(NON_NULL_TESTS)
-       @EXEEXT=$(EXEEXT) CFLAGS='$(CFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' TEST_CFLAGS='$(TEST_CFLAGS)' CC='$(CC)' \
-               VALAFLAGS="PKG_CONFIG_PATH=$(srcdir)/version" $(srcdir)/testrunner.sh $(VERSION_CHECK_TESTS)
+       @export PKG_CONFIG_PATH=$(abs_srcdir)/version; EXEEXT=$(EXEEXT) CFLAGS='$(CFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' \
+               TEST_CFLAGS='$(TEST_CFLAGS)' CC='$(CC)' $(srcdir)/testrunner.sh $(VERSION_CHECK_TESTS)
        @EXEEXT=$(EXEEXT) CFLAGS='$(CFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' TEST_CFLAGS='$(TEST_CFLAGS)' CC='$(CC)' \
                $(srcdir)/testrunner.sh $(GENIE_TESTS)