Merge branch 'REL9_5_STABLE' into PGPRO9_5

vbwagner · vbwagner · commit 1800214b935b · 2016-02-25T15:34:00.000+03:00
Merge tap test fixes
diff --git a/src/bin/pgbench/Makefile b/src/bin/pgbench/Makefile
@@ -37,6 +37,7 @@ uninstall:
 
 clean distclean:
 	rm -f pgbench$(X) $(OBJS)
+	rm -rf tmp_check
 
 maintainer-clean: distclean
 	rm -f exprparse.c exprscan.c
diff --git a/src/test/ssl/Makefile b/src/test/ssl/Makefile
@@ -122,5 +122,8 @@ ssl/root+client.crl: ssl/root.crl ssl/client.crl
 sslfiles-clean:
 	rm -f $(SSLFILES) ssl/client_ca.srl ssl/server_ca.srl ssl/client_ca-certindex* ssl/server_ca-certindex* ssl/root_ca-certindex* ssl/root_ca.srl ssl/temp_ca.crt ssl/temp_ca_signed.crt
 
+clean distclean maintainer-clean:
+	rm -rf tmp_check
+
 check:
 	$(prove_check)
diff --git a/src/tools/msvc/clean.bat b/src/tools/msvc/clean.bat
@@ -92,6 +92,7 @@ if exist src\test\regress\autoinc.dll del /q src\test\regress\autoinc.dll
 if exist src\bin\initdb\tmp_check rd /s /q src\bin\initdb\tmp_check
 if exist src\bin\pg_basebackup\tmp_check rd /s /q src\bin\pg_basebackup\tmp_check
 if exist src\bin\pg_config\tmp_check rd /s /q src\bin\pg_config\tmp_check
+if exist src\bin\pg_controldata\tmp_check rd /s /q src\bin\pg_controldata\tmp_check
 if exist src\bin\pg_ctl\tmp_check rd /s /q src\bin\pg_ctl\tmp_check
 if exist src\bin\pg_rewind\tmp_check rd /s /q src\bin\pg_rewind\tmp_check
 if exist src\bin\pgbench\tmp_check rd /s /q src\bin\pgbench\tmp_check
