From: Aki Tuomi Date: Wed, 5 Jun 2013 14:29:03 +0000 (+0300) Subject: Fixed to use ruby 1.9.1 X-Git-Tag: rec-3.6.0-rc1~698^2~1 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0412fc387b1da253f95e176cb041701c0daa49d8;p=pdns Fixed to use ruby 1.9.1 --- diff --git a/.travis.yml b/.travis.yml index 9ea975980..a7dd63a93 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ compiler: - gcc before_script: - sudo apt-get update - - sudo apt-get install libboost-all-dev libtolua-dev bc libcdb-dev libnet-dns-perl ldnsutils dnsutils libtool libcdb-dev xmlto dblatex links ruby-json ruby-sqlite3 rubygems libcurl4-openssl-dev + - sudo apt-get install libboost-all-dev libtolua-dev bc libcdb-dev libnet-dns-perl ldnsutils dnsutils libtool libcdb-dev xmlto dblatex links ruby-json ruby-sqlite3 rubygems libcurl4-openssl-dev ruby1.9.1 - sudo sed -i '0,/\[mysqld\]/s//[mysqld]\nskip-character-set-client-handshake/' /etc/mysql/my.cnf - sudo restart mysql script: diff --git a/modules/remotebackend/regression-tests/backend.rb b/modules/remotebackend/regression-tests/backend.rb index 444e40218..8f8594180 100755 --- a/modules/remotebackend/regression-tests/backend.rb +++ b/modules/remotebackend/regression-tests/backend.rb @@ -1,4 +1,4 @@ -#!/usr/bin/ruby +#!/usr/bin/ruby1.9.1 require 'json' require 'sqlite3' diff --git a/modules/remotebackend/regression-tests/http-backend.rb b/modules/remotebackend/regression-tests/http-backend.rb index 6bf6be373..8be678a87 100755 --- a/modules/remotebackend/regression-tests/http-backend.rb +++ b/modules/remotebackend/regression-tests/http-backend.rb @@ -1,4 +1,4 @@ -#!/usr/bin/ruby +#!/usr/bin/ruby1.9.1 require "rubygems" #require "bundler/setup" require "webrick" diff --git a/modules/remotebackend/regression-tests/pipe-backend.rb b/modules/remotebackend/regression-tests/pipe-backend.rb index 271c78212..27f1213d3 100755 --- a/modules/remotebackend/regression-tests/pipe-backend.rb +++ b/modules/remotebackend/regression-tests/pipe-backend.rb @@ -1,4 +1,4 @@ -#!/usr/bin/ruby +#!/usr/bin/ruby1.9.1 require 'json' require '../modules/remotebackend/regression-tests/backend' diff --git a/modules/remotebackend/unittest_http.rb b/modules/remotebackend/unittest_http.rb index 25b9f3689..da10670da 100755 --- a/modules/remotebackend/unittest_http.rb +++ b/modules/remotebackend/unittest_http.rb @@ -1,4 +1,4 @@ -#!/usr/bin/ruby +#!/usr/bin/ruby1.9.1 require 'json' require 'thread' diff --git a/modules/remotebackend/unittest_json.rb b/modules/remotebackend/unittest_json.rb index 25691be83..1496bd6f1 100755 --- a/modules/remotebackend/unittest_json.rb +++ b/modules/remotebackend/unittest_json.rb @@ -1,4 +1,4 @@ -#!/usr/bin/ruby +#!/usr/bin/ruby1.9.1 require 'json' require 'thread' diff --git a/modules/remotebackend/unittest_pipe.rb b/modules/remotebackend/unittest_pipe.rb index ea24e130b..f3c3c51ed 100755 --- a/modules/remotebackend/unittest_pipe.rb +++ b/modules/remotebackend/unittest_pipe.rb @@ -1,4 +1,4 @@ -#!/usr/bin/ruby +#!/usr/bin/ruby1.9.1 require 'rubygems' require 'json' diff --git a/modules/remotebackend/unittest_post.rb b/modules/remotebackend/unittest_post.rb index ae65ce56a..079d7ad96 100755 --- a/modules/remotebackend/unittest_post.rb +++ b/modules/remotebackend/unittest_post.rb @@ -1,4 +1,4 @@ -#!/usr/bin/ruby +#!/usr/bin/ruby1.9.1 require 'json' require 'thread'