Commit Graph

438 Commits

Author SHA1 Message Date
Matteo Beccati
cc3a1af62a Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed broken XML junit output due to escaping of CDATA sections
2014-05-27 11:07:32 +02:00
Matteo Beccati
56bcb22afb Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed broken XML junit output due to escaping of CDATA sections
2014-05-27 11:07:19 +02:00
Matteo Beccati
1696166466 Fixed broken XML junit output due to escaping of CDATA sections
I've removed CDATA and used htmlspecialchars as the output might not be UTF-8 safe, as pointed out by ircmaxell in 26b37f1792
2014-05-27 11:04:48 +02:00
Matteo Beccati
370256ad4b Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix broken Junit output with --disable-cgi
2014-05-25 00:08:41 +02:00
Matteo Beccati
980c63651c Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix broken Junit output with --disable-cgi
2014-05-25 00:08:32 +02:00
Matteo Beccati
f9357b44f3 Fix broken Junit output with --disable-cgi 2014-05-25 00:07:52 +02:00
Adam Harvey
34900eb289 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix run-tests.php with Valgrind >= 3.10.0.
2014-05-22 22:37:57 +00:00
Adam Harvey
e5e6ba093f Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix run-tests.php with Valgrind >= 3.10.0.

Conflicts:
	run-tests.php
2014-05-22 22:37:47 +00:00
Adam Harvey
5d1bfd6fbf Fix run-tests.php with Valgrind >= 3.10.0.
The version test that we had in run-tests.php assumed that the major and minor
version numbers were always single digits. This removes that assumption and
also uses version_compare() for the comparison instead of naively converting it
to an integer.
2014-05-22 22:37:08 +00:00
Nuno Lopes
f46200bcc0 fix regex to detect valgrind version
New PCRE version got stricter
2014-02-08 07:06:44 -05:00
Nuno Lopes
62404e767a fix regex to detect valgrind version
New PCRE version got stricter
2014-02-08 06:54:27 -05:00
Gernot Vormayr
dff0d51243 Add some basic and apparmor tests to fpm 2014-01-17 12:49:07 +04:00
Dmitry Stogov
621f83e35c Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed bug #65559 (Opcache: cache not cleared if changes occur while running)
  bring the news

Conflicts:
	NEWS
2013-11-26 11:36:23 +04:00
Dmitry Stogov
a8c7e50f4d Fixed bug #65559 (Opcache: cache not cleared if changes occur while running) 2013-11-26 11:34:41 +04:00
Remi Collet
8c05e861d6 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  avoid doing a stream_select on a closed stream
2013-11-19 12:42:44 +01:00
Remi Collet
87cabc04ac Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  avoid doing a stream_select on a closed stream
2013-11-19 12:42:25 +01:00
Remi Collet
25c08a839a avoid doing a stream_select on a closed stream 2013-11-19 12:41:58 +01:00
Michael Wallner
5f41cb18be Merge branch 'issue-55736' of https://github.com/tistre/php-src
implements FR #55736

* 'issue-55736' of https://github.com/tistre/php-src:
  run-tests.php: Adding support for sections EXPECT_EXTERNAL, EXPECTF_EXTERNAL and EXPECTREGEX_EXTERNAL. (Issue 55736)
2013-10-09 10:06:45 +02:00
Michael Wallner
4b61203b01 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix bug #62396 'make test' crashes starting with 5.3.14 (missing gzencode())
2013-10-01 17:01:44 +02:00
Michael Wallner
cd1cab3f47 fix bug #62396 'make test' crashes starting with 5.3.14
(missing gzencode())
2013-10-01 17:01:03 +02:00
Tim Strehle
5ffaf95d3f run-tests.php: Adding support for sections EXPECT_EXTERNAL, EXPECTF_EXTERNAL and EXPECTREGEX_EXTERNAL. (Issue 55736) 2013-09-03 14:40:43 +02:00
Stanislav Malyshev
2ee7e122a7 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Add -P option to use the current binary
  Create test to the extension xmlrpc
2013-08-18 14:09:19 -07:00
Stanislav Malyshev
3da2fb335d Add -P option to use the current binary 2013-08-18 14:08:03 -07:00
Stanislav Malyshev
02e4d7a290 Merge branch 'pull-request/341'
* pull-request/341: (23 commits)
  typofixes
2013-06-10 14:30:59 -07:00
Stanislav Malyshev
ac40c0b562 Merge branch 'pull-request/341'
* pull-request/341: (23 commits)
  typofixes
2013-06-10 14:20:18 -07:00
Dmitry Stogov
e9641141aa Made test compatible with O+ 2013-03-16 16:11:00 +04:00
Xinchen Hui
16efc77608 count($test_files) already be checked above : if ($test_cnt)
thus we can use $sum_results instead of the preg_match
2012-11-25 16:18:20 +08:00
Xinchen Hui
11c946e594 XFAIL test should not be considered as failed 2012-11-25 12:04:12 +08:00
Remi Collet
dd093ac12a add --offline option to run-tests command 2012-09-30 19:40:57 -07:00
Stanislav Malyshev
4ba2d546c8 Merge branch 'PHP-5.4'
* PHP-5.4:
  add news for --offline
  add --offline option to run-tests command
  Bug #63147: SKIP_ONLINE_TESTS, for getmxrr
  Bug #63147: introduce SKIP_ONLINE_TESTS, for gethostbyname
  gethostbyname_basic002.phpt is a duplicate to gethostbyname_error004.phpt
2012-09-30 19:41:54 -07:00
Hannes Magnusson
ac227f4ba9 Merge branch 'PHP-5.4'
* PHP-5.4:
  Do not unload shared extensions when checking for leaks
2012-07-17 10:06:02 +01:00
Hannes Magnusson
88f7f3c00f Do not unload shared extensions when checking for leaks 2012-07-17 10:04:56 +01:00
Anthony Ferrara
6abd7365d0 Merge branch 'PHP-5.4'
* PHP-5.4:
  Fix two issues with run-tests.php
2012-07-06 22:39:32 -04:00
Anthony Ferrara
26b37f1792 Fix two issues with run-tests.php
1. E_STRICT error due to passing return of array_intersect() into reset() directly
2. Details in junit output can produce invalid UTF-8 and XML due to unescaped characters
2012-07-06 22:37:50 -04:00
Felipe Pena
eb012cf884 - Fixed bug #62415 (Undefined variable: diff in run-tests.php on line 2093 for successful XFAIL) 2012-06-30 16:42:28 -03:00
Felipe Pena
75d8af715c - Fixed bug #62415 (Undefined variable: diff in run-tests.php on line 2093 for successful XFAIL) 2012-06-30 16:29:30 -03:00
David Soria Parra
814e7bcf6c Merge branch 'PHP-5.4'
By Till Klampaeckel
* PHP-5.4:
  Don't depend on a fixed path for PHP shebang but use /usr/bin/env (cherry picked from commit 89c5d981603ed4a2a54f86c20cec4f263c58ded6)
2012-06-07 09:45:12 +02:00
Till Klampaeckel
c56ff39c05 Don't depend on a fixed path for PHP shebang but use /usr/bin/env
(cherry picked from commit 89c5d981603ed4a2a54f86c20cec4f263c58ded6)
2012-06-07 09:44:49 +02:00
Davey Shafik
5ef46fe43c Fix boolean casting and whitespace (@dsp / #68) 2012-05-28 06:25:03 -04:00
Davey Shafik
3966df7fc8 Add support for Travis CI 2012-05-28 06:22:24 -04:00
Nuno Lopes
72911237b5 sync with HEAD 2012-05-27 20:13:09 -04:00
Nuno Lopes
77b086f3f0 128 MB is enough for everyone (TM)
this is an initial tentative to avoid some testcases go crazy and consume 16 GB of memory. Additional measures will have to be taken if the problem persists.
Please patch individual tests that really require more than 128MB of memory
2012-05-27 20:03:58 -04:00
Nuno Lopes
af2d6a63bf remove remaining traces of unicode.* ini settings 2012-05-27 19:57:34 -04:00
zoe slattery
1af8b3f883 Change impl of GZIP_POST, DEFLATE_POST. See #62021 2012-05-15 11:05:20 +01:00
Shein Alexey
1e88d0033f Refactoring junit logger. Added generation of nested testsuites in junit.xml. 2012-03-28 21:39:24 +01:00
David Soria Parra
f7b10abae9 Replace $Revision$ with $Id$ in keyword expansion enable files 2012-03-20 17:53:47 +01:00
Michael Wallner
a07759a013 add --PUT-- section support based on POST_RAW 2012-03-17 09:35:25 +00:00
Michael Wallner
b39ffa3f34 merge 322758 (detect a php-cgi which is a sibling of php cli) 2012-03-09 19:51:09 +00:00
Rasmus Lerdorf
510bb3131b Simple fix that just quotes the filenames in run-tests to support paths with spaces.
Fixes bug #60734
2012-01-28 02:43:31 +00:00
Derick Rethans
0dcf098efd This changes adds the --EXTENSION-- section to .phpt files as
described in http://marc.info/?t=132248616300007&r=1&w=2.
2011-12-06 05:44:54 +00:00