From 51ce4bd87c4f47150cf2edcf3b6ac0534a462666 Mon Sep 17 00:00:00 2001 From: Nuno Lopes Date: Sun, 31 Aug 2014 15:19:14 +0100 Subject: add a few more patterns to .gitignore --- .gitignore | 25 ++++++++++++++ Zend/tests/constants/dir-constant-includes.phpt | 8 ++--- .../constants/dir-constant-nested_includes.phpt | 40 +++++++++++----------- Zend/tests/constants/fixtures/folder1/fixture.inc | 3 ++ Zend/tests/constants/fixtures/folder1/fixture.php | 3 -- .../fixtures/folder1/subfolder1/fixture.inc | 3 ++ .../fixtures/folder1/subfolder1/fixture.php | 3 -- .../fixtures/folder1/subfolder2/fixture.inc | 3 ++ .../fixtures/folder1/subfolder2/fixture.php | 3 -- .../fixtures/folder1/subfolder3/fixture.inc | 3 ++ .../fixtures/folder1/subfolder3/fixture.php | 3 -- .../fixtures/folder1/subfolder4/fixture.inc | 3 ++ .../fixtures/folder1/subfolder4/fixture.php | 3 -- Zend/tests/constants/fixtures/folder2/fixture.inc | 3 ++ Zend/tests/constants/fixtures/folder2/fixture.php | 3 -- .../fixtures/folder2/subfolder1/fixture.inc | 3 ++ .../fixtures/folder2/subfolder1/fixture.php | 3 -- .../fixtures/folder2/subfolder2/fixture.inc | 3 ++ .../fixtures/folder2/subfolder2/fixture.php | 3 -- .../fixtures/folder2/subfolder3/fixture.inc | 3 ++ .../fixtures/folder2/subfolder3/fixture.php | 3 -- .../fixtures/folder2/subfolder4/fixture.inc | 3 ++ .../fixtures/folder2/subfolder4/fixture.php | 3 -- Zend/tests/constants/fixtures/folder3/fixture.inc | 3 ++ Zend/tests/constants/fixtures/folder3/fixture.php | 3 -- .../fixtures/folder3/subfolder1/fixture.inc | 3 ++ .../fixtures/folder3/subfolder1/fixture.php | 3 -- .../fixtures/folder3/subfolder2/fixture.inc | 3 ++ .../fixtures/folder3/subfolder2/fixture.php | 3 -- .../fixtures/folder3/subfolder3/fixture.inc | 3 ++ .../fixtures/folder3/subfolder3/fixture.php | 3 -- .../fixtures/folder3/subfolder4/fixture.inc | 3 ++ .../fixtures/folder3/subfolder4/fixture.php | 3 -- Zend/tests/constants/fixtures/folder4/fixture.inc | 3 ++ Zend/tests/constants/fixtures/folder4/fixture.php | 3 -- .../fixtures/folder4/subfolder1/fixture.inc | 3 ++ .../fixtures/folder4/subfolder1/fixture.php | 3 -- .../fixtures/folder4/subfolder2/fixture.inc | 3 ++ .../fixtures/folder4/subfolder2/fixture.php | 3 -- .../fixtures/folder4/subfolder3/fixture.inc | 3 ++ .../fixtures/folder4/subfolder3/fixture.php | 3 -- .../fixtures/folder4/subfolder4/fixture.inc | 3 ++ .../fixtures/folder4/subfolder4/fixture.php | 3 -- 43 files changed, 109 insertions(+), 84 deletions(-) create mode 100755 Zend/tests/constants/fixtures/folder1/fixture.inc delete mode 100755 Zend/tests/constants/fixtures/folder1/fixture.php create mode 100755 Zend/tests/constants/fixtures/folder1/subfolder1/fixture.inc delete mode 100755 Zend/tests/constants/fixtures/folder1/subfolder1/fixture.php create mode 100755 Zend/tests/constants/fixtures/folder1/subfolder2/fixture.inc delete mode 100755 Zend/tests/constants/fixtures/folder1/subfolder2/fixture.php create mode 100755 Zend/tests/constants/fixtures/folder1/subfolder3/fixture.inc delete mode 100755 Zend/tests/constants/fixtures/folder1/subfolder3/fixture.php create mode 100755 Zend/tests/constants/fixtures/folder1/subfolder4/fixture.inc delete mode 100755 Zend/tests/constants/fixtures/folder1/subfolder4/fixture.php create mode 100755 Zend/tests/constants/fixtures/folder2/fixture.inc delete mode 100755 Zend/tests/constants/fixtures/folder2/fixture.php create mode 100755 Zend/tests/constants/fixtures/folder2/subfolder1/fixture.inc delete mode 100755 Zend/tests/constants/fixtures/folder2/subfolder1/fixture.php create mode 100755 Zend/tests/constants/fixtures/folder2/subfolder2/fixture.inc delete mode 100755 Zend/tests/constants/fixtures/folder2/subfolder2/fixture.php create mode 100755 Zend/tests/constants/fixtures/folder2/subfolder3/fixture.inc delete mode 100755 Zend/tests/constants/fixtures/folder2/subfolder3/fixture.php create mode 100755 Zend/tests/constants/fixtures/folder2/subfolder4/fixture.inc delete mode 100755 Zend/tests/constants/fixtures/folder2/subfolder4/fixture.php create mode 100755 Zend/tests/constants/fixtures/folder3/fixture.inc delete mode 100755 Zend/tests/constants/fixtures/folder3/fixture.php create mode 100755 Zend/tests/constants/fixtures/folder3/subfolder1/fixture.inc delete mode 100755 Zend/tests/constants/fixtures/folder3/subfolder1/fixture.php create mode 100755 Zend/tests/constants/fixtures/folder3/subfolder2/fixture.inc delete mode 100755 Zend/tests/constants/fixtures/folder3/subfolder2/fixture.php create mode 100755 Zend/tests/constants/fixtures/folder3/subfolder3/fixture.inc delete mode 100755 Zend/tests/constants/fixtures/folder3/subfolder3/fixture.php create mode 100755 Zend/tests/constants/fixtures/folder3/subfolder4/fixture.inc delete mode 100755 Zend/tests/constants/fixtures/folder3/subfolder4/fixture.php create mode 100755 Zend/tests/constants/fixtures/folder4/fixture.inc delete mode 100755 Zend/tests/constants/fixtures/folder4/fixture.php create mode 100755 Zend/tests/constants/fixtures/folder4/subfolder1/fixture.inc delete mode 100755 Zend/tests/constants/fixtures/folder4/subfolder1/fixture.php create mode 100755 Zend/tests/constants/fixtures/folder4/subfolder2/fixture.inc delete mode 100755 Zend/tests/constants/fixtures/folder4/subfolder2/fixture.php create mode 100755 Zend/tests/constants/fixtures/folder4/subfolder3/fixture.inc delete mode 100755 Zend/tests/constants/fixtures/folder4/subfolder3/fixture.php create mode 100755 Zend/tests/constants/fixtures/folder4/subfolder4/fixture.inc delete mode 100755 Zend/tests/constants/fixtures/folder4/subfolder4/fixture.php 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 --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 --EXPECTF-- %stests%sconstants diff --git a/Zend/tests/constants/fixtures/folder1/fixture.inc b/Zend/tests/constants/fixtures/folder1/fixture.inc new file mode 100755 index 0000000000..3406c998ac --- /dev/null +++ b/Zend/tests/constants/fixtures/folder1/fixture.inc @@ -0,0 +1,3 @@ +