summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2014-12-19 02:34:33 +0100
committerHolger Levsen <holger@layer-acht.org>2014-12-21 09:47:01 +0100
commit41074b2174484e23e6bd7a16023884bf3930aa94 (patch)
treee6659cbc4f8053babc639925d51e0d66b48c722e
parent2e4f4c6c3be01266c8b5685ab80530b08208adb3 (diff)
downloadjenkins.debian.net-41074b2174484e23e6bd7a16023884bf3930aa94.tar.xz
lvc: set SIKULI_IMAGE_PATH in libvirt_cucumber_tests directly
-rwxr-xr-xbin/libvirt_cucumber_tests1
-rw-r--r--features/support/helpers/sikuli_helper.rb1
2 files changed, 1 insertions, 1 deletions
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