[PHP-CVS] svn: /php/phpruntests/trunk/ build.xml

2012-05-09 Thread Zoe Slattery 
zoe  Wed, 09 May 2012 18:57:48 +

Revision: http://svn.php.net/viewvc?view=revision&revision=325631

Log:
remove hard coded paths

Changed paths:
U   php/phpruntests/trunk/build.xml

Modified: php/phpruntests/trunk/build.xml
===
--- php/phpruntests/trunk/build.xml 2012-05-09 16:54:16 UTC (rev 325630)
+++ php/phpruntests/trunk/build.xml 2012-05-09 18:57:48 UTC (rev 325631)
@@ -50,8 +50,10 @@
   

   
-
+
+

+
 
 

@@ -62,8 +64,8 @@

 

-
-
+
+

 


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/phpruntests/trunk/tests/testcase/sections/configurationsections/ rtPostSectionTest.php

2012-05-09 Thread Zoe Slattery 
zoe  Wed, 09 May 2012 16:54:16 +

Revision: http://svn.php.net/viewvc?view=revision&revision=325630

Log:
clean up temporary file

Changed paths:
U   
php/phpruntests/trunk/tests/testcase/sections/configurationsections/rtPostSectionTest.php

Modified: 
php/phpruntests/trunk/tests/testcase/sections/configurationsections/rtPostSectionTest.php
===
--- 
php/phpruntests/trunk/tests/testcase/sections/configurationsections/rtPostSectionTest.php
   2012-05-09 16:29:30 UTC (rev 325629)
+++ 
php/phpruntests/trunk/tests/testcase/sections/configurationsections/rtPostSectionTest.php
   2012-05-09 16:54:16 UTC (rev 325630)
@@ -13,6 +13,9 @@
 $fileName = $postSection->getPostFileName();
 $string = file_get_contents($fileName);

+//clean up
+unlink($fileName);
+
 $this->assertEquals('hello=World&goodbye=MrChips', $string);
 }
 }

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/phpruntests/trunk/phpt-tests/ hw.php

2012-05-09 Thread Zoe Slattery 
zoe  Wed, 09 May 2012 16:29:30 +

Revision: http://svn.php.net/viewvc?view=revision&revision=325629

Log:
moree tidying

Changed paths:
D   php/phpruntests/trunk/phpt-tests/hw.php

Deleted: php/phpruntests/trunk/phpt-tests/hw.php
===
--- php/phpruntests/trunk/phpt-tests/hw.php 2012-05-09 16:27:07 UTC (rev 
325628)
+++ php/phpruntests/trunk/phpt-tests/hw.php 2012-05-09 16:29:30 UTC (rev 
325629)
@@ -1,3 +0,0 @@
-

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/phpruntests/trunk/phpt-tests/utils/ hw.save

2012-05-09 Thread Zoe Slattery 
zoe  Wed, 09 May 2012 16:27:07 +

Revision: http://svn.php.net/viewvc?view=revision&revision=325628

Log:
added by accident

Changed paths:
D   php/phpruntests/trunk/phpt-tests/utils/hw.save

Deleted: php/phpruntests/trunk/phpt-tests/utils/hw.save
===
--- php/phpruntests/trunk/phpt-tests/utils/hw.save  2012-05-09 16:26:29 UTC 
(rev 325627)
+++ php/phpruntests/trunk/phpt-tests/utils/hw.save  2012-05-09 16:27:07 UTC 
(rev 325628)
@@ -1,3 +0,0 @@
-

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/phpruntests/trunk/ build.xml phpt-tests/sample_clean.php phpt-tests/sample_clean_fail.php phpt-tests/sample_fileexternal.phpt phpt-tests/sample_gzippost.phpt phpt-tests/utils/hw.ph

2012-05-09 Thread Zoe Slattery 
zoe  Wed, 09 May 2012 16:26:29 +

Revision: http://svn.php.net/viewvc?view=revision&revision=325627

Log:
tidying up

Changed paths:
U   php/phpruntests/trunk/build.xml
D   php/phpruntests/trunk/phpt-tests/sample_clean.php
D   php/phpruntests/trunk/phpt-tests/sample_clean_fail.php
U   php/phpruntests/trunk/phpt-tests/sample_fileexternal.phpt
U   php/phpruntests/trunk/phpt-tests/sample_gzippost.phpt
A   php/phpruntests/trunk/phpt-tests/utils/
A   php/phpruntests/trunk/phpt-tests/utils/hw.php
A   php/phpruntests/trunk/phpt-tests/utils/hw.save
A   php/phpruntests/trunk/phpt-tests/utils/windows_line_endings.php
D   php/phpruntests/trunk/phpt-tests/windows_line_endings.php
U   php/phpruntests/trunk/tests/testcase/rtCookieExecutionTest.php

Modified: php/phpruntests/trunk/build.xml
===
--- php/phpruntests/trunk/build.xml 2012-05-09 16:12:35 UTC (rev 325626)
+++ php/phpruntests/trunk/build.xml 2012-05-09 16:26:29 UTC (rev 325627)
@@ -11,6 +11,15 @@
 
 
 
+
+   
+   
+   
+   
+   
+   
+   
+
   

   
@@ -28,13 +37,6 @@
 
   
 
-
-
-  
-
-
-  
-
   

   

Deleted: php/phpruntests/trunk/phpt-tests/sample_clean.php
===
--- php/phpruntests/trunk/phpt-tests/sample_clean.php   2012-05-09 16:12:35 UTC 
(rev 325626)
+++ php/phpruntests/trunk/phpt-tests/sample_clean.php   2012-05-09 16:26:29 UTC 
(rev 325627)
@@ -1,7 +0,0 @@
-

Deleted: php/phpruntests/trunk/phpt-tests/sample_clean_fail.php
===
--- php/phpruntests/trunk/phpt-tests/sample_clean_fail.php  2012-05-09 
16:12:35 UTC (rev 325626)
+++ php/phpruntests/trunk/phpt-tests/sample_clean_fail.php  2012-05-09 
16:26:29 UTC (rev 325627)
@@ -1,7 +0,0 @@
-

Modified: php/phpruntests/trunk/phpt-tests/sample_fileexternal.phpt
===
--- php/phpruntests/trunk/phpt-tests/sample_fileexternal.phpt   2012-05-09 
16:12:35 UTC (rev 325626)
+++ php/phpruntests/trunk/phpt-tests/sample_fileexternal.phpt   2012-05-09 
16:26:29 UTC (rev 325627)
@@ -1,6 +1,6 @@
 --TEST--
 sample test for file_external
 --FILE_EXTERNAL--
-hw.php
+utils/hw.php
 --EXPECT--
 hello world

Modified: php/phpruntests/trunk/phpt-tests/sample_gzippost.phpt
===
--- php/phpruntests/trunk/phpt-tests/sample_gzippost.phpt   2012-05-09 
16:12:35 UTC (rev 325626)
+++ php/phpruntests/trunk/phpt-tests/sample_gzippost.phpt   2012-05-09 
16:26:29 UTC (rev 325627)
@@ -5,8 +5,8 @@
 --FILE--
 

Added: php/phpruntests/trunk/phpt-tests/utils/hw.save
===
--- php/phpruntests/trunk/phpt-tests/utils/hw.save  
(rev 0)
+++ php/phpruntests/trunk/phpt-tests/utils/hw.save  2012-05-09 16:26:29 UTC 
(rev 325627)
@@ -0,0 +1,3 @@
+

Added: php/phpruntests/trunk/phpt-tests/utils/windows_line_endings.php
===
--- php/phpruntests/trunk/phpt-tests/utils/windows_line_endings.php 
(rev 0)
+++ php/phpruntests/trunk/phpt-tests/utils/windows_line_endings.php 
2012-05-09 16:26:29 UTC (rev 325627)
@@ -0,0 +1,10 @@
+

Deleted: php/phpruntests/trunk/phpt-tests/windows_line_endings.php
===
--- php/phpruntests/trunk/phpt-tests/windows_line_endings.php   2012-05-09 
16:12:35 UTC (rev 325626)
+++ php/phpruntests/trunk/phpt-tests/windows_line_endings.php   2012-05-09 
16:26:29 UTC (rev 325627)
@@ -1,10 +0,0 @@
-

Modified: php/phpruntests/trunk/tests/testcase/rtCookieExecutionTest.php
===
--- php/phpruntests/trunk/tests/testcase/rtCookieExecutionTest.php  
2012-05-09 16:12:35 UTC (rev 325626)
+++ php/phpruntests/trunk/tests/testcase/rtCookieExecutionTest.php  
2012-05-09 16:26:29 UTC (rev 325627)
@@ -12,7 +12,7 @@
 {
 $this->php = trim(shell_exec("which php"));
 $this->php_cgi = trim(shell_exec("which php-cgi"));
-
+
 $this->path_to_tests = realpath(dirname(__FILE__) . 
'/../../phpt-tests');
 $this->sample_test = $this->path_to_tests . '/sample_cookie.phpt';
 }
@@ -31,7 +31,7 @@

 //Retrieve the array of test file names
 $testFiles = $config->getSetting('TestFiles');
-
+
 //Read the test file
 $testFile = new rtPhpTestFile();
 $testFile->doRead($testFiles[0]);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: Fix bug 61901 ext\phar\tests\phar_buildfromdirectory2.phpt fails: ext/phar/tests/phar_buildfromdirectory2-win.phpt ext/phar/tests/phar_buildfromdirectory2.phpt

2012-05-09 Thread Anatoliy Belsky 
Commit:7fb16d5bd9cd5a317c52ed36b5a94fc5e0067b4a
Author:Anatoliy Belsky  Wed, 9 May 2012 13:02:33 +0200
Parents:   c12fdbde5fe1da3f5ddd3be70a807b46755ff118
Branches:  PHP-5.3 PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=7fb16d5bd9cd5a317c52ed36b5a94fc5e0067b4a

Log:
Fix bug 61901 ext\phar\tests\phar_buildfromdirectory2.phpt fails

Another error message is produced by win specific code

Bugs:
https://bugs.php.net/61901

Changed paths:
  A  ext/phar/tests/phar_buildfromdirectory2-win.phpt
  M  ext/phar/tests/phar_buildfromdirectory2.phpt


Diff:
diff --git a/ext/phar/tests/phar_buildfromdirectory2-win.phpt 
b/ext/phar/tests/phar_buildfromdirectory2-win.phpt
new file mode 100644
index 000..9dbcf96
--- /dev/null
+++ b/ext/phar/tests/phar_buildfromdirectory2-win.phpt
@@ -0,0 +1,30 @@
+--TEST--
+Phar::buildFromDirectory() - non-directory passed as first parameter
+--SKIPIF--
+
+--INI--
+phar.require_hash=0
+phar.readonly=0
+--FILE--
+buildFromDirectory(1);
+} catch (Exception $e) {
+   var_dump(get_class($e));
+   echo $e->getMessage() . "\n";
+}
+?>
+===DONE===
+--CLEAN--
+
+--EXPECTF--
+%s(24) "UnexpectedValueException"
+RecursiveDirectoryIterator::__construct(1,1): The system cannot find the file 
specified. (code: 2)
+===DONE===
diff --git a/ext/phar/tests/phar_buildfromdirectory2.phpt 
b/ext/phar/tests/phar_buildfromdirectory2.phpt
index 6c67f20..639ff0b 100644
--- a/ext/phar/tests/phar_buildfromdirectory2.phpt
+++ b/ext/phar/tests/phar_buildfromdirectory2.phpt
@@ -1,7 +1,10 @@
 --TEST--
 Phar::buildFromDirectory() - non-directory passed as first parameter
 --SKIPIF--
-
+
 --INI--
 phar.require_hash=0
 phar.readonly=0


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php