From 41074b2174484e23e6bd7a16023884bf3930aa94 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Fri, 19 Dec 2014 02:34:33 +0100 Subject: lvc: set SIKULI_IMAGE_PATH in libvirt_cucumber_tests directly --- bin/libvirt_cucumber_tests | 1 + features/support/helpers/sikuli_helper.rb | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/libvirt_cucumber_tests b/bin/libvirt_cucumber_tests index e7d60524..bd90741e 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 SIKULI_IMAGE_PATH="/srv/jenkins/features/images/" export RUBYLIB="/srv/jenkins" export VM_XML_PATH="/srv/jenkins/features/domains" export DISPLAY=${TARGET_DISPLAY} diff --git a/features/support/helpers/sikuli_helper.rb b/features/support/helpers/sikuli_helper.rb index 12f49603..503e08b3 100644 --- a/features/support/helpers/sikuli_helper.rb +++ b/features/support/helpers/sikuli_helper.rb @@ -124,7 +124,6 @@ def sikuli_script_proxy.new(*args) end # Configure sikuli -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 -- cgit v1.2.3-70-g09d2