diff options
| author | Holger Levsen <holger@layer-acht.org> | 2014-12-19 01:19:14 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2014-12-21 09:47:00 +0100 |
| commit | 6a4f66e94a15948e90ae0583f8f4c3814ce58f3b (patch) | |
| tree | 2c232b0e51db194492e652113df6145faf71e49b | |
| parent | df5ba847892f305daa05bb4496d7caf522d8f533 (diff) | |
| download | jenkins.debian.net-6a4f66e94a15948e90ae0583f8f4c3814ce58f3b.tar.xz | |
lvc: set RUBYLIB and adopt features accordingly
| -rwxr-xr-x | bin/libvirt_cucumber_tests | 1 | ||||
| -rw-r--r-- | features/support/config.rb | 6 | ||||
| -rw-r--r-- | features/support/env.rb | 2 | ||||
| -rw-r--r-- | features/support/helpers/sikuli_helper.rb | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/bin/libvirt_cucumber_tests b/bin/libvirt_cucumber_tests index cf7abeb9..6b3dc21e 100755 --- a/bin/libvirt_cucumber_tests +++ b/bin/libvirt_cucumber_tests @@ -187,6 +187,7 @@ fi export JAVA_HOME="/usr/lib/jvm/java-7-openjdk-amd64" export SIKULI_HOME="/usr/share/java" +export RUBYLIB="/srv/jenkins" export DISPLAY=${TARGET_DISPLAY} check_dependency cucumber if [ -z "${*}" ]; then diff --git a/features/support/config.rb b/features/support/config.rb index b5f6fcd9..9e20b61d 100644 --- a/features/support/config.rb +++ b/features/support/config.rb @@ -1,12 +1,12 @@ require 'fileutils' -require "#{Dir.pwd}/features/support/helpers/misc_helpers.rb" +require "features/support/helpers/misc_helpers.rb" # Dynamic $tails_iso = ENV['ISO'] || get_newest_iso $old_tails_iso = ENV['OLD_ISO'] || get_oldest_iso $tmp_dir = ENV['TEMP_DIR'] || "/tmp/TailsToaster" -$vm_xml_path = ENV['VM_XML_PATH'] || "#{Dir.pwd}/features/domains" -$misc_files_dir = "#{Dir.pwd}/features/misc_files" +$vm_xml_path = ENV['VM_XML_PATH'] || "features/domains" +$misc_files_dir = "features/misc_files" $keep_snapshots = !ENV['KEEP_SNAPSHOTS'].nil? $x_display = ENV['DISPLAY'] $debug = !ENV['DEBUG'].nil? diff --git a/features/support/env.rb b/features/support/env.rb index 523a1d1c..3fa5c371 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -1,5 +1,5 @@ require 'rubygems' -require "#{Dir.pwd}/features/support/extra_hooks.rb" +require "features/support/extra_hooks.rb" require 'time' require 'rspec' diff --git a/features/support/helpers/sikuli_helper.rb b/features/support/helpers/sikuli_helper.rb index f6211be7..12f49603 100644 --- a/features/support/helpers/sikuli_helper.rb +++ b/features/support/helpers/sikuli_helper.rb @@ -124,7 +124,7 @@ def sikuli_script_proxy.new(*args) end # Configure sikuli -java.lang.System.setProperty("SIKULI_IMAGE_PATH", "#{Dir.pwd}/features/images/") +java.lang.System.setProperty("SIKULI_IMAGE_PATH", "features/images/") # ruby and rjb doesn't play well together when it comes to static # fields (and possibly methods) so we instantiate and access the field |