bin/calabash-android-run.rb in calabash-android-0.3.0.pre2 vs bin/calabash-android-run.rb in calabash-android-0.3.0.pre3
- old
+ new
@@ -7,11 +7,11 @@
if File.exist?(f) and IO.read(f).include? old_runner
puts "Calabash has been updated"
puts "Please do the following to update your project:"
puts "1) Open #{f} in a text editor"
puts "2) Replace #{old_runner} with #{new_rummer}"
- exit
+ exit 1
end
if app_path
unless File.exist?(test_server_path(app_path))
puts "No test server found for this combination of app and calabash version. Recreating test server."
@@ -24,23 +24,21 @@
else
test_server_port = "34777"
end
env = "PACKAGE_NAME=#{package_name(app_path)} "\
"MAIN_ACTIVITY=#{main_activity(app_path)} "\
- "TEST_PACKAGE_NAME=#{package_name(test_server_path)} "\
"APP_PATH=\"#{app_path}\" "\
"TEST_APP_PATH=\"#{test_server_path}\" "\
"TEST_SERVER_PORT=#{test_server_port}"
else
env = ""
end
STDOUT.sync = true
arguments = ARGV - ["--google-maps-support"]
- cmd = "cucumber #{arguments.join(" ")} #{env} #{"-c" unless is_windows?}"
+ cmd = "cucumber #{arguments.join(" ")} #{env}"
puts cmd
- IO.popen(cmd) do |io|
- io.each { |s| print s }
- end
+ exit_code = system(cmd)
sleep(1)
+ exit_code
end
\ No newline at end of file