Skip to content

Commit 6b00ee5

Browse files
committed
Use custom php ini for travis builds
1 parent 994449f commit 6b00ee5

File tree

5 files changed

+4
-3
lines changed

5 files changed

+4
-3
lines changed

.travis.php.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
xdebug.remote_enable=1

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ notifications:
77
irc: "irc.freenode.org#vdebug"
88
before_install:
99
- sudo apt-get update && sudo apt-get install vim-gtk php5-cli
10-
- sudo echo "xdebug.remote_enable=1" >> /etc/php5/cli/php.ini
1110
before_script:
1211
- "export DISPLAY=:99.0"
1312
- "sh -e /etc/init.d/xvfb start"

features/support/env.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
require 'vimrunner'
22
require_relative "../../rubylib/vdebug"
33

4+
PHP_INI = File.expand_path('../../../.travis.php.ini', __FILE__)
5+
46
Before do
57
Dir.mkdir 'tmpspace' unless Dir.exists? 'tmpspace'
68
Dir.chdir 'tmpspace'

features/support/helpers.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def kill_vim
2020

2121
module ScriptRunner
2222
def run_php_script(path)
23-
fork_and_run 'php', Shellwords.escape(path)
23+
fork_and_run "php -c #{PHP_INI}", Shellwords.escape(path)
2424
end
2525

2626
def fork_and_run(bin, argstr)

rubylib/vdebug.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ def connected?
4343
is_connected = vim.command(
4444
"python print debugger.runner.is_alive()"
4545
)
46-
puts "Connected? #{is_connected.inspect}"
4746
is_connected == "True"
4847
end
4948

0 commit comments

Comments
 (0)