Fixed installcheck in Makefile

dlepikhova · dlepikhova · commit c431f8f4fb32 · 2021-05-24T12:37:44.000+05:00
diff --git a/Makefile b/Makefile
@@ -1,3 +1,4 @@
+
 # contrib/pg_query_state/Makefile
 
 MODULE_big = pg_query_state
@@ -22,16 +23,16 @@ include $(top_builddir)/src/Makefile.global
 include $(top_srcdir)/contrib/contrib-global.mk
 endif
 
-EXTRA_REGRESS_OPTS=--temp-config=$(top_srcdir)/$(subdir)/test.conf
-
 $(EXTENSION)--$(EXTVERSION).sql: init.sql
 	cat $^ > $@
 
-ISOLATIONCHECKS=corner_cases
+ISOLATIONCHECKS = corner_cases
 
 check: isolationcheck
 
-installcheck: isolationcheck-install-force
+installcheck: submake-isolation
+	$(pg_isolation_regress_installcheck) \
+	$(ISOLATIONCHECKS)
 
 isolationcheck: | submake-isolation temp-install
 	$(MKDIR_P) isolation_output
@@ -40,14 +41,7 @@ isolationcheck: | submake-isolation temp-install
       --outputdir=isolation_output \
 	$(ISOLATIONCHECKS)
 
-isolationcheck-install-force: all | submake-isolation submake-pg_query_state temp-install
-	$(pg_isolation_regress_installcheck) \
-	    $(ISOLATIONCHECKS)
-
 submake-isolation:
 	$(MAKE) -C $(top_builddir)/src/test/isolation all
 
-submake-pg_query_state:
-	$(MAKE) -C $(top_builddir)/contrib/pg_query_state
-
 temp-install: EXTRA_INSTALL=contrib/pg_query_state
