From 1f9c2623b4f76a34581c0525db4e185bb1a6f497 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Wed, 5 Aug 2020 14:35:48 -0700
Subject: [PATCH] Revert "Use relative path in test-with-database target so it
works easier within Docker"
This reverts commit 6cc4cbe6bbf6f14aca6ab912a98ee48e3e6a1bae. It
breaks the tests in Fedora's build environment, for some reason.
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index a0acd14e9..aac1470b0 100644
--- a/Makefile
+++ b/Makefile
@@ -164,7 +164,7 @@ test-developer:
.PHONY: test-with-database
test-with-database:
test -d $(TEST_PG_PATH) && (pg_ctl -D $(TEST_PG_PATH) -s status >&/dev/null || pg_ctl -D $(TEST_PG_PATH) -s start) || ./t/test_postgresql $(TEST_PG_PATH)
- PERL5OPT="$(PERL5OPT) -It/lib -MOpenQA::Test::PatchDeparse" $(MAKE) test-unit-and-integration TEST_PG="DBI:Pg:dbname=openqa_test;host=$(TEST_PG_PATH)"
+ PERL5OPT="$(PERL5OPT) -I$(PWD)/t/lib -MOpenQA::Test::PatchDeparse" $(MAKE) test-unit-and-integration TEST_PG="DBI:Pg:dbname=openqa_test;host=$(TEST_PG_PATH)"
-[ $(KEEP_DB) = 1 ] || pg_ctl -D $(TEST_PG_PATH) stop
.PHONY: test-unit-and-integration
--
2.28.0