From 0c33b75e4adf790066091f402d70272a80d0ce59 Mon Sep 17 00:00:00 2001
From: valmat <ufabiz@gmail.com>
Date: Thu, 27 Mar 2014 02:35:25 +0600
Subject: Minor changes to allow the use to tests and extension `.phpt-`

---
 tests/php/phpt/.gitignore              |  7 +++++++
 tests/php/phpt/valueiterator/006.phpt  | 21 +++++++++++++++++++++
 tests/php/phpt/valueiterator/006.phpt- | 21 ---------------------
 tests/test.sh                          | 14 ++++++++++++--
 4 files changed, 40 insertions(+), 23 deletions(-)
 create mode 100644 tests/php/phpt/valueiterator/006.phpt
 delete mode 100644 tests/php/phpt/valueiterator/006.phpt-

(limited to 'tests')

diff --git a/tests/php/phpt/.gitignore b/tests/php/phpt/.gitignore
index e89581c..b583a44 100644
--- a/tests/php/phpt/.gitignore
+++ b/tests/php/phpt/.gitignore
@@ -5,3 +5,10 @@
 *.php
 *.sh
 *.mem
+*.phpt-diff
+*.phpt-exp
+*.phpt-log
+*.phpt-out
+*.phpt-php
+*.phpt-sh
+*.phpt-mem
diff --git a/tests/php/phpt/valueiterator/006.phpt b/tests/php/phpt/valueiterator/006.phpt
new file mode 100644
index 0000000..ea97c2b
--- /dev/null
+++ b/tests/php/phpt/valueiterator/006.phpt
@@ -0,0 +1,21 @@
+--TEST--
+Iterate itarable oblect
+--DESCRIPTION--
+class impIterAggr1 implements IteratorAggregate
+--SKIPIF--
+<?php if (!extension_loaded("extension_for_tests")) print "skip"; ?>
+--FILEEOF--
+<?php
+require dirname(__FILE__) . '/../../include/valueiterator/1.php';
+
+$iag2 = new impIterAggr2;
+
+TestValueIterator\loopValue($iag2);
+
+--EXPECT--
+Array/Object contains 0 items
+[key_0]=firstElement
+[key_1]=secondElement
+[key_2]=lastelEment
+~impIterator
+~impIterAggr2
diff --git a/tests/php/phpt/valueiterator/006.phpt- b/tests/php/phpt/valueiterator/006.phpt-
deleted file mode 100644
index ea97c2b..0000000
--- a/tests/php/phpt/valueiterator/006.phpt-
+++ /dev/null
@@ -1,21 +0,0 @@
---TEST--
-Iterate itarable oblect
---DESCRIPTION--
-class impIterAggr1 implements IteratorAggregate
---SKIPIF--
-<?php if (!extension_loaded("extension_for_tests")) print "skip"; ?>
---FILEEOF--
-<?php
-require dirname(__FILE__) . '/../../include/valueiterator/1.php';
-
-$iag2 = new impIterAggr2;
-
-TestValueIterator\loopValue($iag2);
-
---EXPECT--
-Array/Object contains 0 items
-[key_0]=firstElement
-[key_1]=secondElement
-[key_2]=lastelEment
-~impIterator
-~impIterAggr2
diff --git a/tests/test.sh b/tests/test.sh
index a77d670..8f5baa5 100755
--- a/tests/test.sh
+++ b/tests/test.sh
@@ -78,12 +78,22 @@ do
             
             # if quiet, only delete
             if [ $(echo $SCR_OPT | grep -o "\-q") ]; then
-                find ./php/phpt -type f \( -name '*.diff' -or -name '*.exp' -or -name '*.log' -or -name '*.out' -or -name '*.php' -or -name '*.sh' -or -name '*.mem' \) -delete
+                find ./php/phpt -type f \( \
+                                           -name '*.diff' -or -name '*.exp' -or -name '*.log' -or -name '*.out' \
+                                           -or -name '*.php' -or -name '*.sh' -or -name '*.mem' -or \
+                                           -name '*.phpt-diff' -or -name '*.phpt-exp' -or -name '*.phpt-log' -or -name '*.phpt-out' \
+                                           -or -name '*.phpt-php' -or -name '*.phpt-sh' -or -name '*.phpt-mem' \
+                                        \) -delete
             
             # else delete and print
             else
                 echo -e "\x1b[1;31;47mRemove auxiliary files...\x1b[0;0m"
-                for AUXF in `find ./php/phpt -type f \( -name '*.diff' -or -name '*.exp' -or -name '*.log' -or -name '*.out' -or -name '*.php' -or -name '*.sh' -or -name '*.mem' \)`;
+                for AUXF in `find ./php/phpt -type f \( \
+                                           -name '*.diff' -or -name '*.exp' -or -name '*.log' -or -name '*.out' \
+                                           -or -name '*.php' -or -name '*.sh' -or -name '*.mem' -or \
+                                           -name '*.phpt-diff' -or -name '*.phpt-exp' -or -name '*.phpt-log' -or -name '*.phpt-out' \
+                                           -or -name '*.phpt-php' -or -name '*.phpt-sh' -or -name '*.phpt-mem' \
+                                        \)`;
                     do
                     echo -e "\x1b[1;31;47mdel \x1b[0;30;47m$(dirname $AUXF)/\x1b[1;31;47m$(basename $AUXF)\x1b[0;30;47m ...\x1b[0;0m"
                     rm $AUXF
-- 
cgit v1.2.3