[PHP-CVS] com php-src: Fix bug ext\filter\tests\bug52209.phpt fails: ext/filter/tests/bug52209.phpt
Commit:8249581a2df0c2546721f6a55e58ba9d5e72653b Author:Anatoliy Belsky a...@php.net Mon, 30 Apr 2012 10:25:54 +0200 Parents: a601605f14ce12977b2d3771fd19421ad2aa2f47 Branches: PHP-5.3 PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8249581a2df0c2546721f6a55e58ba9d5e72653b Log: Fix bug ext\filter\tests\bug52209.phpt fails Bugs: https://bugs.php.net/52209 Changed paths: M ext/filter/tests/bug52209.phpt Diff: diff --git a/ext/filter/tests/bug52209.phpt b/ext/filter/tests/bug52209.phpt index bf2ed6c..79db749 100644 --- a/ext/filter/tests/bug52209.phpt +++ b/ext/filter/tests/bug52209.phpt @@ -1,7 +1,13 @@ --TEST-- Bug #52209 (INPUT_ENV returns NULL for set variables (CLI)) --SKIPIF-- -?php if (!extension_loaded(filter) || !empty($_ENV['PWD'])) die(skip); ? +?php +/* This test makes no sense on windows as an empty variable + would never show up in the set list. Which means, it's + always undefined in PHP. */ +if(substr(PHP_OS, 0, 3) == WIN) die(skip Not for Windows); +if (!extension_loaded(filter) || !empty($_ENV['PWD'])) die(skip); +? --INI-- variables_order=GPCSE --FILE-- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fix bug 61870 ext\session\tests\bug42596.phpt fails: ext/session/tests/bug42596.phpt
Commit:680685127fc60fb1891effb7afb33639aa231502
Author:Anatoliy Belsky a...@php.net Mon, 30 Apr 2012 12:06:28
+0200
Parents: 8249581a2df0c2546721f6a55e58ba9d5e72653b
Branches: PHP-5.3 PHP-5.4 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=680685127fc60fb1891effb7afb33639aa231502
Log:
Fix bug 61870 ext\session\tests\bug42596.phpt fails
Bugs:
https://bugs.php.net/61870
https://bugs.php.net/42596
Changed paths:
M ext/session/tests/bug42596.phpt
Diff:
diff --git a/ext/session/tests/bug42596.phpt b/ext/session/tests/bug42596.phpt
index fd9a602..3d11607 100644
--- a/ext/session/tests/bug42596.phpt
+++ b/ext/session/tests/bug42596.phpt
@@ -1,7 +1,10 @@
--TEST--
Bug #42596 (session.save_path MODE option will not set write bit for group
or world)
--SKIPIF--
-?php include('skipif.inc'); ?
+?php
+ if(substr(PHP_OS, 0, 3) == WIN) die(skip not for Windows);
+ include('skipif.inc');
+?
--INI--
session.use_cookies=0
session.cache_limiter=
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Additional fixs for bug 61746 - prepare/clean acls: ext/standard/tests/file/windows_acls/bug44859.phpt ext/standard/tests/file/windows_acls/bug44859_2.phpt ext/standard/tests/fi
Commit:ec5421d04403ac3e7b013e65fdd7b3ad6fc82c18
Author:Anatoliy Belsky a...@php.net Mon, 30 Apr 2012 14:33:48
+0200
Parents: 680685127fc60fb1891effb7afb33639aa231502
Branches: PHP-5.3 PHP-5.4 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=ec5421d04403ac3e7b013e65fdd7b3ad6fc82c18
Log:
Additional fixs for bug 61746 - prepare/clean acls
Bugs:
https://bugs.php.net/61746
Changed paths:
M ext/standard/tests/file/windows_acls/bug44859.phpt
M ext/standard/tests/file/windows_acls/bug44859_2.phpt
M ext/standard/tests/file/windows_acls/bug44859_3.phpt
M ext/standard/tests/file/windows_acls/bug44859_4.phpt
M ext/standard/tests/file/windows_acls/common.inc
Diff:
diff --git a/ext/standard/tests/file/windows_acls/bug44859.phpt
b/ext/standard/tests/file/windows_acls/bug44859.phpt
index bb22a5c..952b6eb 100644
--- a/ext/standard/tests/file/windows_acls/bug44859.phpt
+++ b/ext/standard/tests/file/windows_acls/bug44859.phpt
@@ -8,6 +8,7 @@ skipif();
--FILE--
?php
include_once __DIR__ . '/common.inc';
+fix_acls();
$iteration = array(
PHPT_ACL_READ = false,
diff --git a/ext/standard/tests/file/windows_acls/bug44859_2.phpt
b/ext/standard/tests/file/windows_acls/bug44859_2.phpt
index 3cc4ed1..d741156 100644
--- a/ext/standard/tests/file/windows_acls/bug44859_2.phpt
+++ b/ext/standard/tests/file/windows_acls/bug44859_2.phpt
@@ -8,6 +8,7 @@ skipif();
--FILE--
?php
include_once __DIR__ . '/common.inc';
+fix_acls();
$iteration = array(
PHPT_ACL_READ = true,
diff --git a/ext/standard/tests/file/windows_acls/bug44859_3.phpt
b/ext/standard/tests/file/windows_acls/bug44859_3.phpt
index 7300112..ed57abb 100644
--- a/ext/standard/tests/file/windows_acls/bug44859_3.phpt
+++ b/ext/standard/tests/file/windows_acls/bug44859_3.phpt
@@ -8,6 +8,7 @@ skipif();
--FILE--
?php
include_once __DIR__ . '/common.inc';
+fix_acls();
$iteration = array(
'tiny.exe' = true,
diff --git a/ext/standard/tests/file/windows_acls/bug44859_4.phpt
b/ext/standard/tests/file/windows_acls/bug44859_4.phpt
index c1768d0..954c100 100644
--- a/ext/standard/tests/file/windows_acls/bug44859_4.phpt
+++ b/ext/standard/tests/file/windows_acls/bug44859_4.phpt
@@ -10,6 +10,7 @@ skipif();
--FILE--
?php
include_once __DIR__ . '/common.inc';
+fix_acls();
$iteration = array(
PHPT_ACL_READ = true,
diff --git a/ext/standard/tests/file/windows_acls/common.inc
b/ext/standard/tests/file/windows_acls/common.inc
index 4007ad0..26fadf3 100644
--- a/ext/standard/tests/file/windows_acls/common.inc
+++ b/ext/standard/tests/file/windows_acls/common.inc
@@ -46,6 +46,16 @@ function get_icacls()
return $sysroot\\System32\\icacls.exe;
}
+function fix_acls() {
+ $user = get_username();
+ /* Current user needs to be owner of the test files. As well
+ all the other users having acls on the files must loose them.
+ The following fixes this just partially, as dynamically reading
+ all the users having acls on a file could be sophisticated. */
+ exec(get_icacls() . ' . /setowner $user /T /L /Q 2 nul');
+ exec(get_icacls() . ' . /remove:g Administrators /T /L /Q 2 nul');
+}
+
function icacls_set($path, $mode, $perm) {
$icacls = get_icacls();
$user = get_username();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: - Changed last commit to use VK_ESCAPE on Windows: Zend/zend_language_scanner.l
Commit:31203876173faaf8bc3d7690e81df6404303a62a Author:Felipe Pena felipe...@gmail.com Mon, 30 Apr 2012 10:31:49 -0300 Parents: fc24e74260399bf4a6badeb61f0e0eed4463d1d2 Branches: PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=31203876173faaf8bc3d7690e81df6404303a62a Log: - Changed last commit to use VK_ESCAPE on Windows Changed paths: M Zend/zend_language_scanner.l Diff: diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l index 0a35f3f..2e3d452 100644 --- a/Zend/zend_language_scanner.l +++ b/Zend/zend_language_scanner.l @@ -30,7 +30,9 @@ #endif #include zend_language_scanner_defs.h - +#ifdef PHP_WIN32 +# include Winuser.h +#endif #include errno.h #include zend.h #include zend_alloc.h @@ -906,7 +908,7 @@ static void zend_scan_escape_string(zval *zendlval, char *str, int len, char quo break; case 'e': #ifdef PHP_WIN32 - *t++ = (char) 27; + *t++ = VK_ESCAPE; #else *t++ = '\e'; #endif -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.4': Zend/zend_language_scanner.l
Commit:73b61509922a2fba1864a802f1e8e6a5fb7e7677 Author:Felipe Pena felipe...@gmail.com Mon, 30 Apr 2012 10:31:59 -0300 Parents: 7fa7d9a8c6f674af4231908e0d59f6a5a1fa7659 31203876173faaf8bc3d7690e81df6404303a62a Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=73b61509922a2fba1864a802f1e8e6a5fb7e7677 Log: Merge branch 'PHP-5.4' * PHP-5.4: - Changed last commit to use VK_ESCAPE on Windows Changed paths: MM Zend/zend_language_scanner.l Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fix bug 61868 ext\dom\tests\DOMDocument_validate_on_parse_variation.phpt fails: ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt ext/dom/tests/note.dtd ext/dom/tests/n
Commit:d26e006d7f01db6fab3942ebbf073beaabf57e2d
Author:Anatoliy Belsky a...@php.net Mon, 30 Apr 2012 17:23:49
+0200
Parents: ec5421d04403ac3e7b013e65fdd7b3ad6fc82c18
Branches: PHP-5.3 PHP-5.4
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=d26e006d7f01db6fab3942ebbf073beaabf57e2d
Log:
Fix bug 61868 ext\dom\tests\DOMDocument_validate_on_parse_variation.phpt fails
Bugs:
https://bugs.php.net/61868
Changed paths:
M ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt
A ext/dom/tests/note.dtd
A ext/dom/tests/note.xml
Diff:
diff --git a/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt
b/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt
index 403e01a..d0cea29 100644
--- a/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt
+++ b/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt
@@ -12,7 +12,7 @@ require_once('skipif.inc');
require_once('dom_test.inc');
-chdir(__DIR__ . /../examples);
+chdir(__DIR__);
$XMLStringGood = file_get_contents('note.xml');
$dom = new DOMDocument;
diff --git a/ext/dom/tests/note.dtd b/ext/dom/tests/note.dtd
new file mode 100644
index 000..c2d558e
--- /dev/null
+++ b/ext/dom/tests/note.dtd
@@ -0,0 +1,6 @@
+?xml version=1.0 encoding=utf-8 ?
+!ELEMENT note (to,from,heading,body)
+!ELEMENT to (#PCDATA)
+!ELEMENT from (#PCDATA)
+!ELEMENT heading (#PCDATA)
+!ELEMENT body (#PCDATA)
diff --git a/ext/dom/tests/note.xml b/ext/dom/tests/note.xml
new file mode 100644
index 000..49614a1
--- /dev/null
+++ b/ext/dom/tests/note.xml
@@ -0,0 +1,8 @@
+?xml version=1.0?
+!DOCTYPE note SYSTEM note.dtd
+note
+toPHP User Group/to
+fromShane/from
+headingReminder/heading
+bodyDon't forget the meeting tonight!/body
+/note
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: - Fixed Windows build: Zend/zend_language_scanner.l
Commit:79961dccab18c34befa5b4bc4f6170ea2988e30e Author:Felipe Pena felipe...@gmail.com Mon, 30 Apr 2012 15:55:57 -0300 Parents: 819a7ae6a1f1786716d77741ca5d8ad0189a0c2c Branches: PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=79961dccab18c34befa5b4bc4f6170ea2988e30e Log: - Fixed Windows build Changed paths: M Zend/zend_language_scanner.l Diff: diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l index 2e3d452..703ca96 100644 --- a/Zend/zend_language_scanner.l +++ b/Zend/zend_language_scanner.l @@ -30,11 +30,12 @@ #endif #include zend_language_scanner_defs.h + +#include errno.h +#include zend.h #ifdef PHP_WIN32 # include Winuser.h #endif -#include errno.h -#include zend.h #include zend_alloc.h #include zend_language_parser.h #include zend_compile.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.4': Zend/zend_language_scanner.l
Commit:45ef3c759e80b4eda2e24b2f497be58268989b5f Author:Felipe Pena felipe...@gmail.com Mon, 30 Apr 2012 15:56:15 -0300 Parents: 3e7af0f25ab4cde49b539f2e99f29fba2a95149d 79961dccab18c34befa5b4bc4f6170ea2988e30e Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=45ef3c759e80b4eda2e24b2f497be58268989b5f Log: Merge branch 'PHP-5.4' * PHP-5.4: - Fixed Windows build Changed paths: MM Zend/zend_language_scanner.l Diff: -- 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
zoe Mon, 30 Apr 2012 21:13:32 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=325481
Log:
Fix the directory where tests are run
Changed paths:
U php/phpruntests/trunk/build.xml
Modified: php/phpruntests/trunk/build.xml
===
--- php/phpruntests/trunk/build.xml 2012-04-30 11:55:07 UTC (rev 325480)
+++ php/phpruntests/trunk/build.xml 2012-04-30 21:13:32 UTC (rev 325481)
@@ -60,8 +60,8 @@
exec command=tar xfz QATESTS.tgz dir=/tmp/phpruntests /
-exec command=${php} -n run-tests.php -n -p ${php} /tmp/phpruntests/Zend
/tmp/phpruntests/ext /tmp/phpruntests/sapi /tmp/phpruntests/tests
${project.basedir}/_compare/old.out dir=/tmp/phpruntests passthru=true
checkReturn=true/
-exec command=${php} -n ${project.basedir}/src/run-tests.php -n -p ${php}
-o csv -s ${project.basedir}/_compare/new.out /tmp/phpruntests
dir=${project.basedir} passthru=true checkReturn=true /
+exec command=${php} -n
/Users/zoe/Applications/PHP/php-5.4.0/run-tests.php -n -p ${php}
/tmp/phpruntests/Zend /tmp/phpruntests/ext /tmp/phpruntests/sapi
/tmp/phpruntests/tests ${project.basedir}/_compare/old.out
dir=/tmp/phpruntests passthru=true checkReturn=true/
+exec command=${php} -n ${project.basedir}/src/run-tests.php -n -p ${php}
-o csv -s ${project.basedir}/_compare/new.out /tmp/phpruntests
dir=/tmp/phpruntests passthru=true checkReturn=true /
exec command=${php} -n QA/compareNewOld.php
${project.basedir}/_compare/new.out ${project.basedir}/_compare/old.out
phpruntests ${project.basedir}/_compare/compare_new_old.out
dir=${project.basedir} passthru=true checkReturn=true/
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/phpruntests/trunk/ build.xml
On Mon, Apr 30, 2012 at 11:13 PM, Zoe Slattery z...@php.net wrote:
zoe Mon, 30 Apr 2012 21:13:32 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=325481
Log:
Fix the directory where tests are run
Changed paths:
U php/phpruntests/trunk/build.xml
Modified: php/phpruntests/trunk/build.xml
===
--- php/phpruntests/trunk/build.xml 2012-04-30 11:55:07 UTC (rev 325480)
+++ php/phpruntests/trunk/build.xml 2012-04-30 21:13:32 UTC (rev 325481)
@@ -60,8 +60,8 @@
exec command=tar xfz QATESTS.tgz dir=/tmp/phpruntests /
- exec command=${php} -n run-tests.php -n -p ${php}
/tmp/phpruntests/Zend /tmp/phpruntests/ext /tmp/phpruntests/sapi
/tmp/phpruntests/tests ${project.basedir}/_compare/old.out
dir=/tmp/phpruntests passthru=true checkReturn=true/
- exec command=${php} -n ${project.basedir}/src/run-tests.php -n -p
${php} -o csv -s ${project.basedir}/_compare/new.out /tmp/phpruntests
dir=${project.basedir} passthru=true checkReturn=true /
+ exec command=${php} -n
/Users/zoe/Applications/PHP/php-5.4.0/run-tests.php -n -p ${php}
/tmp/phpruntests/Zend /tmp/phpruntests/ext /tmp/phpruntests/sapi
/tmp/phpruntests/tests ${project.basedir}/_compare/old.out
dir=/tmp/phpruntests passthru=true checkReturn=true/
+ exec command=${php} -n ${project.basedir}/src/run-tests.php -n -p
${php} -o csv -s ${project.basedir}/_compare/new.out /tmp/phpruntests
dir=/tmp/phpruntests passthru=true checkReturn=true /
exec command=${php} -n QA/compareNewOld.php
${project.basedir}/_compare/new.out ${project.basedir}/_compare/old.out
phpruntests ${project.basedir}/_compare/compare_new_old.out
dir=${project.basedir} passthru=true checkReturn=true/
/Users/zoe/Applications/PHP/php-5.4.0/run-tests.php
I think this was committed by accident.
Gergo Erdosi
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
