summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNuno Lopes <nuno@linux.lan>2014-08-31 15:19:14 +0100
committerNuno Lopes <nuno@linux.lan>2014-08-31 15:19:14 +0100
commit51ce4bd87c4f47150cf2edcf3b6ac0534a462666 (patch)
treede8e15348992116aeaf17eed1b2d6ba2202c94a6
parenta3f82ae0eedde80ced142248e26e5a8a11f843ec (diff)
downloadphp-git-51ce4bd87c4f47150cf2edcf3b6ac0534a462666.tar.gz
add a few more patterns to .gitignore
-rw-r--r--.gitignore25
-rw-r--r--Zend/tests/constants/dir-constant-includes.phpt8
-rw-r--r--Zend/tests/constants/dir-constant-nested_includes.phpt40
-rwxr-xr-xZend/tests/constants/fixtures/folder1/fixture.inc (renamed from Zend/tests/constants/fixtures/folder1/fixture.php)0
-rwxr-xr-xZend/tests/constants/fixtures/folder1/subfolder1/fixture.inc (renamed from Zend/tests/constants/fixtures/folder1/subfolder1/fixture.php)0
-rwxr-xr-xZend/tests/constants/fixtures/folder1/subfolder2/fixture.inc (renamed from Zend/tests/constants/fixtures/folder1/subfolder2/fixture.php)0
-rwxr-xr-xZend/tests/constants/fixtures/folder1/subfolder3/fixture.inc (renamed from Zend/tests/constants/fixtures/folder1/subfolder3/fixture.php)0
-rwxr-xr-xZend/tests/constants/fixtures/folder1/subfolder4/fixture.inc (renamed from Zend/tests/constants/fixtures/folder1/subfolder4/fixture.php)0
-rwxr-xr-xZend/tests/constants/fixtures/folder2/fixture.inc (renamed from Zend/tests/constants/fixtures/folder2/fixture.php)0
-rwxr-xr-xZend/tests/constants/fixtures/folder2/subfolder1/fixture.inc (renamed from Zend/tests/constants/fixtures/folder2/subfolder1/fixture.php)0
-rwxr-xr-xZend/tests/constants/fixtures/folder2/subfolder2/fixture.inc (renamed from Zend/tests/constants/fixtures/folder2/subfolder2/fixture.php)0
-rwxr-xr-xZend/tests/constants/fixtures/folder2/subfolder3/fixture.inc (renamed from Zend/tests/constants/fixtures/folder2/subfolder3/fixture.php)0
-rwxr-xr-xZend/tests/constants/fixtures/folder2/subfolder4/fixture.inc (renamed from Zend/tests/constants/fixtures/folder2/subfolder4/fixture.php)0
-rwxr-xr-xZend/tests/constants/fixtures/folder3/fixture.inc (renamed from Zend/tests/constants/fixtures/folder3/fixture.php)0
-rwxr-xr-xZend/tests/constants/fixtures/folder3/subfolder1/fixture.inc (renamed from Zend/tests/constants/fixtures/folder3/subfolder1/fixture.php)0
-rwxr-xr-xZend/tests/constants/fixtures/folder3/subfolder2/fixture.inc (renamed from Zend/tests/constants/fixtures/folder3/subfolder2/fixture.php)0
-rwxr-xr-xZend/tests/constants/fixtures/folder3/subfolder3/fixture.inc (renamed from Zend/tests/constants/fixtures/folder3/subfolder3/fixture.php)0
-rwxr-xr-xZend/tests/constants/fixtures/folder3/subfolder4/fixture.inc (renamed from Zend/tests/constants/fixtures/folder3/subfolder4/fixture.php)0
-rwxr-xr-xZend/tests/constants/fixtures/folder4/fixture.inc (renamed from Zend/tests/constants/fixtures/folder4/fixture.php)0
-rwxr-xr-xZend/tests/constants/fixtures/folder4/subfolder1/fixture.inc (renamed from Zend/tests/constants/fixtures/folder4/subfolder1/fixture.php)0
-rwxr-xr-xZend/tests/constants/fixtures/folder4/subfolder2/fixture.inc (renamed from Zend/tests/constants/fixtures/folder4/subfolder2/fixture.php)0
-rwxr-xr-xZend/tests/constants/fixtures/folder4/subfolder3/fixture.inc (renamed from Zend/tests/constants/fixtures/folder4/subfolder3/fixture.php)0
-rwxr-xr-xZend/tests/constants/fixtures/folder4/subfolder4/fixture.inc (renamed from Zend/tests/constants/fixtures/folder4/subfolder4/fixture.php)0
23 files changed, 49 insertions, 24 deletions
diff --git a/.gitignore b/.gitignore
index b9dd252267..e0943f115c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@
*.gcno
*.la
*.lo
+*.loT
*.o
*.a
*.ncb
@@ -117,6 +118,12 @@ 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
@@ -129,6 +136,12 @@ tests/*/*.sh
*/tests/*/*.exp
*/tests/*/*.log
*/tests/*/*.sh
+*/tests/*/*/*.diff
+*/tests/*/*/*.out
+*/tests/*/*/*.php
+*/tests/*/*/*.exp
+*/tests/*/*/*.log
+*/tests/*/*/*.sh
*/*/tests/*.diff
*/*/tests/*.out
*/*/tests/*.php
@@ -141,6 +154,18 @@ tests/*/*.sh
*/*/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
diff --git a/Zend/tests/constants/dir-constant-includes.phpt b/Zend/tests/constants/dir-constant-includes.phpt
index 8ea65292de..c004cbb6a4 100644
--- a/Zend/tests/constants/dir-constant-includes.phpt
+++ b/Zend/tests/constants/dir-constant-includes.phpt
@@ -4,10 +4,10 @@ __DIR__ constant test with includes
<?php
echo __DIR__ . "\n";
echo dirname(__FILE__) . "\n";
-include 'fixtures/folder1/fixture.php';
-include 'fixtures/folder2/fixture.php';
-include 'fixtures/folder3/fixture.php';
-include 'fixtures/folder4/fixture.php';
+include 'fixtures/folder1/fixture.inc';
+include 'fixtures/folder2/fixture.inc';
+include 'fixtures/folder3/fixture.inc';
+include 'fixtures/folder4/fixture.inc';
?>
--EXPECTF--
%stests%sconstants
diff --git a/Zend/tests/constants/dir-constant-nested_includes.phpt b/Zend/tests/constants/dir-constant-nested_includes.phpt
index 18bdfa8912..c67fbf85e4 100644
--- a/Zend/tests/constants/dir-constant-nested_includes.phpt
+++ b/Zend/tests/constants/dir-constant-nested_includes.phpt
@@ -4,26 +4,26 @@ __DIR__ constant test with nested includes
<?php
echo __DIR__ . "\n";
echo dirname(__FILE__) . "\n";
-include 'fixtures/folder1/fixture.php';
-include 'fixtures/folder1/subfolder1/fixture.php';
-include 'fixtures/folder1/subfolder2/fixture.php';
-include 'fixtures/folder1/subfolder3/fixture.php';
-include 'fixtures/folder1/subfolder4/fixture.php';
-include 'fixtures/folder2/fixture.php';
-include 'fixtures/folder2/subfolder1/fixture.php';
-include 'fixtures/folder2/subfolder2/fixture.php';
-include 'fixtures/folder2/subfolder3/fixture.php';
-include 'fixtures/folder2/subfolder4/fixture.php';
-include 'fixtures/folder3/fixture.php';
-include 'fixtures/folder3/subfolder1/fixture.php';
-include 'fixtures/folder3/subfolder2/fixture.php';
-include 'fixtures/folder3/subfolder3/fixture.php';
-include 'fixtures/folder3/subfolder4/fixture.php';
-include 'fixtures/folder4/fixture.php';
-include 'fixtures/folder4/subfolder1/fixture.php';
-include 'fixtures/folder4/subfolder2/fixture.php';
-include 'fixtures/folder4/subfolder3/fixture.php';
-include 'fixtures/folder4/subfolder4/fixture.php';
+include 'fixtures/folder1/fixture.inc';
+include 'fixtures/folder1/subfolder1/fixture.inc';
+include 'fixtures/folder1/subfolder2/fixture.inc';
+include 'fixtures/folder1/subfolder3/fixture.inc';
+include 'fixtures/folder1/subfolder4/fixture.inc';
+include 'fixtures/folder2/fixture.inc';
+include 'fixtures/folder2/subfolder1/fixture.inc';
+include 'fixtures/folder2/subfolder2/fixture.inc';
+include 'fixtures/folder2/subfolder3/fixture.inc';
+include 'fixtures/folder2/subfolder4/fixture.inc';
+include 'fixtures/folder3/fixture.inc';
+include 'fixtures/folder3/subfolder1/fixture.inc';
+include 'fixtures/folder3/subfolder2/fixture.inc';
+include 'fixtures/folder3/subfolder3/fixture.inc';
+include 'fixtures/folder3/subfolder4/fixture.inc';
+include 'fixtures/folder4/fixture.inc';
+include 'fixtures/folder4/subfolder1/fixture.inc';
+include 'fixtures/folder4/subfolder2/fixture.inc';
+include 'fixtures/folder4/subfolder3/fixture.inc';
+include 'fixtures/folder4/subfolder4/fixture.inc';
?>
--EXPECTF--
%stests%sconstants
diff --git a/Zend/tests/constants/fixtures/folder1/fixture.php b/Zend/tests/constants/fixtures/folder1/fixture.inc
index 3406c998ac..3406c998ac 100755
--- a/Zend/tests/constants/fixtures/folder1/fixture.php
+++ b/Zend/tests/constants/fixtures/folder1/fixture.inc
diff --git a/Zend/tests/constants/fixtures/folder1/subfolder1/fixture.php b/Zend/tests/constants/fixtures/folder1/subfolder1/fixture.inc
index 86e6859363..86e6859363 100755
--- a/Zend/tests/constants/fixtures/folder1/subfolder1/fixture.php
+++ b/Zend/tests/constants/fixtures/folder1/subfolder1/fixture.inc
diff --git a/Zend/tests/constants/fixtures/folder1/subfolder2/fixture.php b/Zend/tests/constants/fixtures/folder1/subfolder2/fixture.inc
index 86e6859363..86e6859363 100755
--- a/Zend/tests/constants/fixtures/folder1/subfolder2/fixture.php
+++ b/Zend/tests/constants/fixtures/folder1/subfolder2/fixture.inc
diff --git a/Zend/tests/constants/fixtures/folder1/subfolder3/fixture.php b/Zend/tests/constants/fixtures/folder1/subfolder3/fixture.inc
index 86e6859363..86e6859363 100755
--- a/Zend/tests/constants/fixtures/folder1/subfolder3/fixture.php
+++ b/Zend/tests/constants/fixtures/folder1/subfolder3/fixture.inc
diff --git a/Zend/tests/constants/fixtures/folder1/subfolder4/fixture.php b/Zend/tests/constants/fixtures/folder1/subfolder4/fixture.inc
index 86e6859363..86e6859363 100755
--- a/Zend/tests/constants/fixtures/folder1/subfolder4/fixture.php
+++ b/Zend/tests/constants/fixtures/folder1/subfolder4/fixture.inc
diff --git a/Zend/tests/constants/fixtures/folder2/fixture.php b/Zend/tests/constants/fixtures/folder2/fixture.inc
index 3406c998ac..3406c998ac 100755
--- a/Zend/tests/constants/fixtures/folder2/fixture.php
+++ b/Zend/tests/constants/fixtures/folder2/fixture.inc
diff --git a/Zend/tests/constants/fixtures/folder2/subfolder1/fixture.php b/Zend/tests/constants/fixtures/folder2/subfolder1/fixture.inc
index 86e6859363..86e6859363 100755
--- a/Zend/tests/constants/fixtures/folder2/subfolder1/fixture.php
+++ b/Zend/tests/constants/fixtures/folder2/subfolder1/fixture.inc
diff --git a/Zend/tests/constants/fixtures/folder2/subfolder2/fixture.php b/Zend/tests/constants/fixtures/folder2/subfolder2/fixture.inc
index 86e6859363..86e6859363 100755
--- a/Zend/tests/constants/fixtures/folder2/subfolder2/fixture.php
+++ b/Zend/tests/constants/fixtures/folder2/subfolder2/fixture.inc
diff --git a/Zend/tests/constants/fixtures/folder2/subfolder3/fixture.php b/Zend/tests/constants/fixtures/folder2/subfolder3/fixture.inc
index 86e6859363..86e6859363 100755
--- a/Zend/tests/constants/fixtures/folder2/subfolder3/fixture.php
+++ b/Zend/tests/constants/fixtures/folder2/subfolder3/fixture.inc
diff --git a/Zend/tests/constants/fixtures/folder2/subfolder4/fixture.php b/Zend/tests/constants/fixtures/folder2/subfolder4/fixture.inc
index 86e6859363..86e6859363 100755
--- a/Zend/tests/constants/fixtures/folder2/subfolder4/fixture.php
+++ b/Zend/tests/constants/fixtures/folder2/subfolder4/fixture.inc
diff --git a/Zend/tests/constants/fixtures/folder3/fixture.php b/Zend/tests/constants/fixtures/folder3/fixture.inc
index 3406c998ac..3406c998ac 100755
--- a/Zend/tests/constants/fixtures/folder3/fixture.php
+++ b/Zend/tests/constants/fixtures/folder3/fixture.inc
diff --git a/Zend/tests/constants/fixtures/folder3/subfolder1/fixture.php b/Zend/tests/constants/fixtures/folder3/subfolder1/fixture.inc
index 86e6859363..86e6859363 100755
--- a/Zend/tests/constants/fixtures/folder3/subfolder1/fixture.php
+++ b/Zend/tests/constants/fixtures/folder3/subfolder1/fixture.inc
diff --git a/Zend/tests/constants/fixtures/folder3/subfolder2/fixture.php b/Zend/tests/constants/fixtures/folder3/subfolder2/fixture.inc
index 86e6859363..86e6859363 100755
--- a/Zend/tests/constants/fixtures/folder3/subfolder2/fixture.php
+++ b/Zend/tests/constants/fixtures/folder3/subfolder2/fixture.inc
diff --git a/Zend/tests/constants/fixtures/folder3/subfolder3/fixture.php b/Zend/tests/constants/fixtures/folder3/subfolder3/fixture.inc
index 86e6859363..86e6859363 100755
--- a/Zend/tests/constants/fixtures/folder3/subfolder3/fixture.php
+++ b/Zend/tests/constants/fixtures/folder3/subfolder3/fixture.inc
diff --git a/Zend/tests/constants/fixtures/folder3/subfolder4/fixture.php b/Zend/tests/constants/fixtures/folder3/subfolder4/fixture.inc
index 86e6859363..86e6859363 100755
--- a/Zend/tests/constants/fixtures/folder3/subfolder4/fixture.php
+++ b/Zend/tests/constants/fixtures/folder3/subfolder4/fixture.inc
diff --git a/Zend/tests/constants/fixtures/folder4/fixture.php b/Zend/tests/constants/fixtures/folder4/fixture.inc
index 3406c998ac..3406c998ac 100755
--- a/Zend/tests/constants/fixtures/folder4/fixture.php
+++ b/Zend/tests/constants/fixtures/folder4/fixture.inc
diff --git a/Zend/tests/constants/fixtures/folder4/subfolder1/fixture.php b/Zend/tests/constants/fixtures/folder4/subfolder1/fixture.inc
index 86e6859363..86e6859363 100755
--- a/Zend/tests/constants/fixtures/folder4/subfolder1/fixture.php
+++ b/Zend/tests/constants/fixtures/folder4/subfolder1/fixture.inc
diff --git a/Zend/tests/constants/fixtures/folder4/subfolder2/fixture.php b/Zend/tests/constants/fixtures/folder4/subfolder2/fixture.inc
index 86e6859363..86e6859363 100755
--- a/Zend/tests/constants/fixtures/folder4/subfolder2/fixture.php
+++ b/Zend/tests/constants/fixtures/folder4/subfolder2/fixture.inc
diff --git a/Zend/tests/constants/fixtures/folder4/subfolder3/fixture.php b/Zend/tests/constants/fixtures/folder4/subfolder3/fixture.inc
index 86e6859363..86e6859363 100755
--- a/Zend/tests/constants/fixtures/folder4/subfolder3/fixture.php
+++ b/Zend/tests/constants/fixtures/folder4/subfolder3/fixture.inc
diff --git a/Zend/tests/constants/fixtures/folder4/subfolder4/fixture.php b/Zend/tests/constants/fixtures/folder4/subfolder4/fixture.inc
index 86e6859363..86e6859363 100755
--- a/Zend/tests/constants/fixtures/folder4/subfolder4/fixture.php
+++ b/Zend/tests/constants/fixtures/folder4/subfolder4/fixture.inc