summaryrefslogtreecommitdiffstats
path: root/cucumber/features/scripts
diff options
context:
space:
mode:
authorPhilip Hands <phil@hands.com>2016-05-11 17:22:32 +0200
committerPhilip Hands <phil@hands.com>2016-05-11 17:22:32 +0200
commit88d376c9b7d2e52dee57fc67b2cbd07422a4e5bd (patch)
tree63cdd3188dd02c3ab644180f1668ca2fd4578d2c /cucumber/features/scripts
parenta5d56e3b5443263b53b0487c81125123411bd0cf (diff)
downloadjenkins.debian.net-88d376c9b7d2e52dee57fc67b2cbd07422a4e5bd.tar.xz
combined diff with most of the cucmber changes, plus update_jdn stuff
Diffstat (limited to 'cucumber/features/scripts')
-rwxr-xr-xcucumber/features/scripts/vm-execute4
1 files changed, 2 insertions, 2 deletions
diff --git a/cucumber/features/scripts/vm-execute b/cucumber/features/scripts/vm-execute
index fc1bf459..c2082177 100755
--- a/cucumber/features/scripts/vm-execute
+++ b/cucumber/features/scripts/vm-execute
@@ -2,7 +2,7 @@
require 'optparse'
begin
- require "#{`git rev-parse --show-toplevel`.chomp}/features/support/helpers/exec_helper.rb"
+ require "#{`git rev-parse --show-toplevel`.chomp}/cucumber/features/support/helpers/exec_helper.rb"
rescue LoadError => e
raise "This script must be run from within Tails' Git directory."
end
@@ -22,7 +22,7 @@ cmd_opts = {
}
opt_parser = OptionParser.new do |opts|
- opts.banner = "Usage: features/scripts/vm-execute [opts] COMMAND"
+ opts.banner = "Usage: cucumber/features/scripts/vm-execute [opts] COMMAND"
opts.separator ""
opts.separator "Runs commands in the VM guest being tested. This script " \
"must be run from within Tails' Git directory."