Commit Graph

134 Commits

Author SHA1 Message Date
Ferenc Kovacs
12fba83c48 Merge branch 'PHP-5.6'
* PHP-5.6:
  don't try to send in the test results until we restored qa.php.net
  Fix uninitialized value...
  Don't treat warnings as failures in the junit output
2014-10-30 18:19:48 +01:00
Ferenc Kovacs
067852ca61 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  don't try to send in the test results until we restored qa.php.net
  Don't treat warnings as failures in the junit output

Conflicts:
	.travis.yml
2014-10-30 18:14:37 +01:00
Ferenc Kovacs
5515937073 don't try to send in the test results until we restored qa.php.net 2014-10-30 18:12:37 +01:00
Bob Weinand
444b465f3d Re-add phpdbg to travis 2014-10-24 19:32:35 +02:00
Lior Kaplan
a43ddea897 phpdbg doesn't build due to the phpng merge, distable its build & test runs 2014-08-20 13:33:37 +03:00
Dmitry Stogov
8ce2f2caac Merge branch 'master' into phpng
* master:
  Fix still broken session test.  Only return true/false.
  Fixed bug #66830 (Empty header causes PHP built-in web server to hang).
  Followup fix to custom session save handlers
  create locales and re-add test
  rm test for now

Conflicts:
	ext/session/tests/session_set_save_handler_class_012.phpt
2014-07-08 11:32:29 +04:00
Stanislav Malyshev
41448bff7c Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  create locales and re-add test

Conflicts:
	.travis.yml
2014-07-07 10:42:13 -07:00
Stanislav Malyshev
5516963633 create locales and re-add test 2014-07-07 10:34:43 -07:00
Dmitry Stogov
bce6a36c8a Merge branch 'master' into test
* master: (48 commits)
  change locale - looks like not everybody has sl_SI
  Fix bug #66921 - Wrong argument type hint for function intltz_from_date_time_zone
  fix format
  Fix bug #67052 (NumberFormatter::parse() resets LC_NUMERIC setting)
  Make sure the generator script also creates a newline at the end of file
  Add newline at end of file to prevent compilation warning
  Fix handling of session user module custom handlers.
  Reference bug report instead of github issue in NEWS file
  add more exts for Travis
  Update NEWS
  Fix phpdbg.1 man page installation when build != src directory
  BFN for bug #67551 (php://input temp file will be located in sys_temp_dir instead of upload_tmp_dir)
  reorder
  restore API compatibility
  finish
  refactor php_stream_temp_create{,_ex} and use it for the php://input stream
  refactor _php_stream_fopen_{temporary_,tmp}file()
  fix length overflow of HTTP_RAW_POST_DATA
  Update NEWS
  Fixed bug #67215 (php-cgi work with opcache, may be segmentation fault happen)
  ...

Conflicts:
	ext/opcache/zend_accelerator_util_funcs.c
	ext/session/mod_user.c
	ext/spl/spl_array.c
	ext/spl/spl_dllist.c
	ext/standard/file.c
	ext/standard/streamsfuncs.c
	ext/standard/string.c
	main/streams/memory.c
2014-07-07 19:21:23 +04:00
Stanislav Malyshev
7bb86f8a6b add more exts for Travis 2014-07-05 19:59:26 -07:00
Dmitry Stogov
dd1c68e67f Merge branch 'master' into phpng
* master: (77 commits)
  NEWS entry for Fix potential segfault in dns_get_record()
  NEWS entry for "Fix potential segfault in dns_get_record()"
  NEWS entry for Fix potential segfault in dns_get_record(
  Fix potential segfault in dns_get_record()
  Revert "Add optional second arg to unserialize()"
  5.5.15 now
  update NEWS
  Fix bug #66127 (Segmentation fault with ArrayObject unset)
  5.4.31 next
  Add NEWS. This doesn't need UPGRADING (or an RFC), IMO.
  Fix broken test.
  Add a mime type map generation script and update the header.
  Move the mime type map out of php_cli_server.c for easier generation.
  Replace the CLI server's linear search for extensions with a hash table.
  fix test
  Remove unused included file
  NEWS
  NEWS
  NEWS
  Fixed Bug #67413 	fileinfo: cdf_read_property_info insufficient boundary chec
  ...

Conflicts:
	Zend/zend_closures.c
	Zend/zend_execute.c
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
	ext/spl/spl_array.c
	ext/standard/basic_functions.c
	ext/standard/dns.c
	ext/standard/var.c
2014-06-12 05:07:33 +04:00
Ferenc Kovacs
5ec5c80dc4 enable phpdbg for the travis build, and also run the testsuite for it 2014-06-09 15:30:09 +02:00
Dmitry Stogov
b11a30f5ea Merge branch 'master' into phpng
* master:
  Support for __debugInfo (Joe Watkins)
  Optimize ZEND_POW (Rouven Weßling)
  gcov: tentative fix for broken coverage data after fix for opcache coverage slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir
  gcov: tentative fix for broken coverage data after fix for opcache coverage slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir
  Prevent recursion in ZF2 Parameters class
  adding NEWS block for beta4
  5.4.30 next
  enable email notifications
  update NEWS
  update NEWS
  update NEWS
  - Updated to version 2014.3 (2014c)
  fix bug #67253: timelib_meridian_with_check out-of-bounds read
  Fix bug #67252: convert_uudecode out-of-bounds read
  Fix bug #67251 - date_parse_from_format out-of-bounds read
  Fix bug #67250 (iptcparse out-of-bounds read)

Conflicts:
	ext/opcache/zend_persist.c
	ext/spl/spl_array.c
2014-05-18 21:17:31 +04:00
Stanislav Malyshev
6b6a58c904 enable email notifications
[skip ci]
2014-05-13 17:14:06 -07:00
Stanislav Malyshev
f90505f5c4 don't bother with travis for now, not ready yet 2014-05-08 01:05:17 -07:00
Ferenc Kovacs
58f4bf441a only build and test nts non-debug and ts debug builds as discussed at https://github.com/php/php-src/pull/654 2014-05-03 02:50:37 +02:00
Ferenc Kovacs
192b35382a Revert "show leaks in their own group"
using valgrind would be a bit too much for travis I guess.

This reverts commit ea60d79e23.
2014-05-02 09:49:10 +02:00
Ferenc Kovacs
ea60d79e23 show leaks in their own group 2014-05-02 09:32:42 +02:00
Ferenc Kovacs
ea1d42641c separate travis jobs for debug and non-debug builds 2014-04-29 16:09:51 +02:00
Ferenc Kovacs
4cad8fcad2 separate travis jobs for TS and NTS builds 2014-04-29 16:09:42 +02:00
Michael Wallner
b5283b9b7a double test timeout for travis 2013-09-16 09:35:08 +02:00
Stanislav Malyshev
a2d8ae9a1f fix mysql tests & mark nextRowset problematic tests 2013-08-24 23:56:48 -07:00
Stanislav Malyshev
817eebc733 fix mysql init 2013-08-24 19:39:00 -07:00
Stanislav Malyshev
f31d6bc0d9 add mysql settings 2013-08-24 19:38:30 -07:00
Nikita Popov
2b62226188 Fix cli server tests on travis
This passes an absolute path to the executable, rather than a relative.
Maybe this is something that should be done automatically by
run-tests.php as it doesn't apply only to travis.
2013-03-23 21:43:55 +01:00
Nikita Popov
bda5c0b082 Show diffs on Travis CI 2013-03-23 18:25:18 +01:00
David Soria Parra
0d85a86bbb Disable email notifications for travis-ci 2012-06-08 22:56:22 +02:00
David Soria Parra
f8d60e2f09 Travis stop spamming 2012-06-07 19:45:56 +02:00
David Soria Parra
160b5b564c Fix indention 2012-06-03 19:20:17 +02:00
David Soria Parra
1fc6b3c4d9 Send mails to php-qa@lists.php.net whenever a build is failing 2012-06-03 19:11:10 +02:00
Davey Shafik
3db6d59a63 Source all extension scripts for ENV vars 2012-05-28 06:22:25 -04:00
Davey Shafik
0fe8b495ad Add extension configs, compile more extensions 2012-05-28 06:22:25 -04:00
Davey Shafik
f15beda158 Reformat, setup MySQL DB, call run-tests directly 2012-05-28 06:22:25 -04:00
Davey Shafik
3966df7fc8 Add support for Travis CI 2012-05-28 06:22:24 -04:00