diff options
| author | Philip Hands <phil@hands.com> | 2017-06-29 22:11:09 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2017-08-01 00:53:58 -0400 |
| commit | a6f41c35e337db192e612ee6e1545fcae4c69ac7 (patch) | |
| tree | 3d03ff353fee11bb00de060f73c6b4d040173e9a /cucumber/features/scripts | |
| parent | c49069662ccf276a7b97f77524f3e2638c9fa152 (diff) | |
| download | jenkins.debian.net-a6f41c35e337db192e612ee6e1545fcae4c69ac7.tar.xz | |
lvc: grab updates from tails (01371c19bd..6ae59c49e5)
Signed-off-by: Holger Levsen <holger@layer-acht.org>
Diffstat (limited to 'cucumber/features/scripts')
| -rwxr-xr-x | cucumber/features/scripts/vm-execute | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cucumber/features/scripts/vm-execute b/cucumber/features/scripts/vm-execute index 79b6942b..f3d20f9f 100755 --- a/cucumber/features/scripts/vm-execute +++ b/cucumber/features/scripts/vm-execute @@ -2,7 +2,9 @@ require 'optparse' begin - require "#{`git rev-parse --show-toplevel`.chomp}/cucumber/features/support/helpers/exec_helper.rb" + require "#{`git rev-parse --show-toplevel`.chomp}/cucumber/features/support/helpers/remote_shell.rb" + require "#{`git rev-parse --show-toplevel`.chomp}/cucumber/features/support/helpers/misc_helpers.rb" + rescue LoadError => e raise "This script must be run from within Tails' Git directory." end @@ -46,7 +48,7 @@ opt_parser = OptionParser.new do |opts| end opt_parser.parse!(ARGV) cmd = ARGV.join(" ") -c = VMCommand.new(FakeVM.new, cmd, cmd_opts) +c = RemoteShell::ShellCommand.new(FakeVM.new, cmd, cmd_opts) puts "Return status: #{c.returncode}" puts "STDOUT:\n#{c.stdout}" puts "STDERR:\n#{c.stderr}" |