mirror of
				https://github.com/postgres/postgres.git
				synced 2025-11-03 09:13:20 +03:00 
			
		
		
		
	Add a temp-install prerequisite to "check"-like targets not having one.
Makefile.global assigns this prerequisite to every target named "check",
but similar targets must mention it explicitly.  Affected targets
failed, tested $PATH binaries, or tested a stale temporary installation.
The src/test/modules examples worked properly when called as "make -C
src/test/modules/$FOO check", but "make -j" allowed the test to start
before the temporary installation was in place.  Back-patch to 9.5,
where commit dcae5facca introduced the
shared temp-install.
			
			
This commit is contained in:
		@@ -81,7 +81,7 @@ check: all
 | 
			
		||||
	$(with_temp_install) ./pg_regress $(REGRESS_OPTS) --temp-instance=./tmp_check $(TEMP_CONF) --bindir= $(pg_regress_locale_flags) $(THREAD) --schedule=$(srcdir)/ecpg_schedule sql/twophase
 | 
			
		||||
 | 
			
		||||
# the same options, but with --listen-on-tcp
 | 
			
		||||
checktcp: all
 | 
			
		||||
checktcp: all | temp-install
 | 
			
		||||
	$(with_temp_install) ./pg_regress $(REGRESS_OPTS) --temp-instance=./tmp_check $(TEMP_CONF) --bindir= $(pg_regress_locale_flags) $(THREAD) --schedule=$(srcdir)/ecpg_schedule_tcp --host=localhost
 | 
			
		||||
 | 
			
		||||
installcheck: all
 | 
			
		||||
@@ -95,5 +95,5 @@ installcheck: all
 | 
			
		||||
installcheck-prepared-txns: all
 | 
			
		||||
	./pg_regress $(REGRESS_OPTS) --bindir='$(bindir)' $(pg_regress_locale_flags) $(THREAD) --schedule=$(srcdir)/ecpg_schedule sql/twophase
 | 
			
		||||
 | 
			
		||||
check-prepared-txns: all
 | 
			
		||||
check-prepared-txns: all | temp-install
 | 
			
		||||
	$(with_temp_install) ./pg_regress $(REGRESS_OPTS) --temp-instance=./tmp_check $(TEMP_CONF) --bindir= $(pg_regress_locale_flags) $(THREAD) --schedule=$(srcdir)/ecpg_schedule sql/twophase
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user