Skip to content

Commit af5dc39

Browse files
committed
adjust travis.yml
1 parent c70aaf9 commit af5dc39

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Rakefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ task :integration do
3737
sh "phpenv config-add tests/integration/protocolbuffers.ini"
3838
sh "sudo make install"
3939
sh "sudo cp tests/integration/php-fpm.conf ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf"
40-
sh "~/.phpenv/versions/$(phpenv version-name)/sbin/php-fpm"
40+
sh "sudo ~/.phpenv/versions/$(phpenv version-name)/sbin/php-fpm"
4141
sleep 1
42-
sh "tests/integration/fcgiget.php localhost:9000/home/vagrant/php-protocolbuffers/tests/integration/test.php"
42+
cmd_run("tests/integration/fcgiget.php localhost:9000/home/vagrant/php-protocolbuffers/tests/integration/test.php")
4343
end
4444
end

protocolbuffers.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ static void php_protocolbuffers_init_globals() {
307307

308308
PHP_MINIT_FUNCTION(protocolbuffers)
309309
{
310-
ZEND_INIT_MODULE_GLOBALS(protocolbuffers, php_protocolbuffers_init_globals, NULL);
310+
//ZEND_INIT_MODULE_GLOBALS(protocolbuffers, php_protocolbuffers_init_globals, NULL);
311311
REGISTER_INI_ENTRIES();
312312

313313
php_protocolbuffers_init(TSRMLS_C);

0 commit comments

Comments
 (0)