bin/calabash-android-run.rb in calabash-android-0.3.0.pre4 vs bin/calabash-android-run.rb in calabash-android-0.3.0.pre5

@@ -12,12 +12,17 @@
     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."
-      calabash_build(app_path)
+      if ARGV.include? "--no-build"
+        puts "No test server found for this combination of app and calabash version. Exiting!"
+        exit 1
+      else
+        puts "No test server found for this combination of app and calabash version. Recreating test server."
+        calabash_build(app_path)
+      end
     end
 
     test_server_path = test_server_path(app_path)
     if ENV["TEST_SERVER_PORT"]
       test_server_port = ENV["TEST_SERVER_PORT"]
@@ -32,10 +37,10 @@
   else
     env = ""
   end
 
   STDOUT.sync = true
-  arguments = ARGV - ["--google-maps-support"]
+  arguments = ARGV - ["--google-maps-support", "--no-build"]
   cmd = "cucumber #{arguments.join(" ")} #{env}"
   puts cmd
   exit_code = system(cmd)
 
   sleep(1)
\ No newline at end of file