Commit Graph

453 Commits

Author SHA1 Message Date
Matteo Beccati
abfb30dc67 Don't treat warnings as failures in the junit output
This matches Travis and the actual return code.
2014-10-29 14:34:48 +01:00
Timm Friebe
e83580c1f0 Merge branch 'master' into catchable-fatals/methods-on-non-objects 2014-09-25 19:45:05 +02:00
Johannes Schlüter
d0cb715373 s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
Nikita Popov
3defdb1880 Also skip line-overwriting if SHOW_ONLY_GROUPS is used 2014-09-13 21:02:04 +02:00
Nikita Popov
7014dec761 Don't show TEST line if SHOW_ONLY_GROUPS is used 2014-09-11 16:27:53 +02:00
Timm Friebe
a1554ca634 Merge in changes from master
Now also includes "on [TYPE]" in "Call to a member function" error
2014-07-06 17:07:01 +02:00
Timm Friebe
ab4ded90f2 Add support for PHP's 'extended information for debugger/profiler' mode 2014-07-06 14:46:34 +02:00
Matteo Beccati
5270563167 Escape non-printable characters in the junit XML output
XML doesn't allow most of the characters < 0x20 and binary output
breaks XML parsers. Such characters are not allowed as entities
either, so the generated entities are escaped in order to be printed
as text.
2014-05-27 12:04:52 +02:00
Matteo Beccati
eb2bd85004 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Escape non-printable characters in the junit XML output
2014-05-27 12:04:26 +02:00
Matteo Beccati
abfd977410 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Escape non-printable characters in the junit XML output
2014-05-27 12:04:17 +02:00
Matteo Beccati
92d54f81d6 Escape non-printable characters in the junit XML output
XML doesn't allow most of the characters < 0x20 and binary output
breaks XML parsers. Such characters are not allowed as entities
either, so the generated entities are escaped in order to be printed
as text.
2014-05-27 12:03:38 +02:00
Matteo Beccati
1b08c885ba 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:08:03 +02:00
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
7b7d2952a6 fix regex to detect valgrind version
New PCRE version got stricter
2014-02-08 07:07:15 -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
Antony Dovgal
998f506b6d Merge branch 'fpm-apparmor-fixed' of https://github.com/notti/php-src
* 'fpm-apparmor-fixed' of https://github.com/notti/php-src:
  Add some basic and apparmor tests to fpm
  Add --force-stderr to fpm
  Add apparmor change hat functionality to fpm
2014-01-16 17:36:03 +04:00
Gernot Vormayr
e9883779a0 Add some basic and apparmor tests to fpm 2014-01-07 00:21:24 +01: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