Clean up .gitignore

Simply test rules using ** globs, remove some outdated rules and
group some rules differently.

1 files changed, 27 insertions, 85 deletions

diff --git a/.gitignore b/.gitignore
index 4013490325..77189e32ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,17 +31,9 @@
 phpt.*
 core
 dynlib.m4
-Debug
-Debug_TS
 Makefile
 Makefile.fragments
 Makefile.objects
-Release
-Release_TS
-Release_TSDbg
-Release_TS_inline
-Release_inline
-ZendEngine1
 _libs
 acconfig.h
 aclocal.m4
@@ -64,8 +56,6 @@ configuration-parser.h
 configuration-parser.output
 configuration-scanner.c
 configure
-configure.bat
-configure.js
 conftest
 conftest.c
 debug.log
@@ -95,7 +85,6 @@ stamp-h
 test.php3
 tmp-php.ini
 want_dependencies
-x64
 stamp-h.in
 scan_makefile_in.awk
 TSRM/tsrm_config.h
@@ -114,63 +103,6 @@ ext/phar/phar.php
 main/php_config.h
 main/php_config.h.in
 
-# Test specific Ignores
-tests/*/*.diff
-tests/*/*.out
-tests/*/*.php
-tests/*/*.exp
-tests/*/*.log
-tests/*/*.sh
-tests/*/*/*.diff
-tests/*/*/*.out
-tests/*/*/*.php
-tests/*/*/*.exp
-tests/*/*/*.log
-tests/*/*/*.sh
-*/tests/*.diff
-*/tests/*.out
-*/tests/*.php
-*/tests/*.exp
-*/tests/*.log
-*/tests/*.sh
-*/tests/*/*.diff
-*/tests/*/*.out
-*/tests/*/*.php
-*/tests/*/*.exp
-*/tests/*/*.log
-*/tests/*/*.sh
-*/tests/*/*/*.diff
-*/tests/*/*/*.out
-*/tests/*/*/*.php
-*/tests/*/*/*.exp
-*/tests/*/*/*.log
-*/tests/*/*/*.sh
-*/*/tests/*.diff
-*/*/tests/*.out
-*/*/tests/*.out.png
-*/*/tests/*.php
-*/*/tests/*.exp
-*/*/tests/*.log
-*/*/tests/*.sh
-*/*/tests/*/*.diff
-*/*/tests/*/*.out
-*/*/tests/*/*.php
-*/*/tests/*/*.exp
-*/*/tests/*/*.log
-*/*/tests/*/*.sh
-*/*/tests/*/*/*.diff
-*/*/tests/*/*/*.out
-*/*/tests/*/*/*.php
-*/*/tests/*/*/*.exp
-*/*/tests/*/*/*.log
-*/*/tests/*/*/*.sh
-*/*/tests/*/*/*/*.diff
-*/*/tests/*/*/*/*.out
-*/*/tests/*/*/*/*.php
-*/*/tests/*/*/*/*.exp
-*/*/tests/*/*/*/*.log
-*/*/tests/*/*/*/*.sh
-
 # Extension specifc ignores
 ext/*/configure.in
 ext/*/configure.ac
@@ -217,30 +149,18 @@ ext/mssql/configure.in
 ext/mssql/configure.ac
 ext/mssql/ltmain.sh
 ext/mysql/weztest.sqlite
-ext/oci8/tests/*.tmp
 ext/oci8/tests/*.vglog
 ext/pdo/conftest*
-ext/pdo/tests/*.db
-ext/pdo/tests/*.tmp
 ext/pdo_firebird/conftest*
 ext/pdo_mysql/conftest*
-ext/pdo_mysql/tests/*.db
-ext/pdo_mysql/tests/*.tmp
 ext/pdo_oci/conftest*
-ext/pdo_odbc/tests/*.db
-ext/pdo_odbc/tests/*.tmp
 ext/pdo_odbc/tests/*.mdb
 ext/pdo_pgsql/conftest*
-ext/pdo_pgsql/tests/*.db
-ext/pdo_pgsql/tests/*.tmp
 ext/pdo_sqlite/conftest*
 ext/pdo_sqlite/sqlite3.h
-ext/pdo_sqlite/tests/*.db
-ext/pdo_sqlite/tests/*.tmp
 ext/phar/phar.phar
 ext/phar/phar.1
 ext/phar/phar.phar.1
-ext/pspell/tests/*.tmp
 ext/reflection/xml
 ext/reflection/html
 ext/reflection/spl.chm
@@ -248,10 +168,6 @@ ext/simplexml/examples/security.new.xml
 ext/spl/examples/.htaccess
 ext/spl/examples/*.phps
 ext/sqlite3/tests/phpsql*
-ext/sqlite3/tests/*.db
-ext/sqlite3/tests/*.tmp
-ext/standard/tests/misc/*.txt
-ext/standard/tests/strings/*.txt
 main/build-defs.h
 main/internal_functions_cli.c
 main/config.w32.h
@@ -286,4 +202,30 @@ win32/*.positions
 win32/ext
 win32/phpts.def
 win32/wsyslog.h
-config.*.bat
+
+# ------------------------------------------------------------------------------ Windows
+# Generated by `/buildconf.bat`
+/configure.bat
+/configure.js
+
+# Generated by `/configure.(bat|js)` (architecture dependend)
+/config.nice.bat
+/Debug/
+/Debug_TS/
+/Release/
+/Release_TS/
+/x64/
+
+# ------------------------------------------------------------------------------ Tests
+# Generated by `/run-tests.php` upon failure.
+**/tests/**/*.diff
+**/tests/**/*.out*
+**/tests/**/*.php
+**/tests/**/*.exp
+**/tests/**/*.log
+**/tests/**/*.sh
+
+# Used by some test cases.
+**/tests/**/*.db
+**/tests/**/*.txt
+**/tests/**/*.tmp