lib/calabash/cli/console.rb in calabash-2.0.0.pre6 vs lib/calabash/cli/console.rb in calabash-2.0.0.pre9

@@ -21,15 +21,17 @@
 
           case extension
             when '.apk'
               set_platform!(:android)
 
-              # Create the test server if it does not exist
-              test_server = Android::Build::TestServer.new(application_path)
+              unless Environment::TEST_SERVER_PATH
+                # Create the test server if it does not exist
+                test_server = Android::Build::TestServer.new(application_path)
 
-              unless test_server.exists?
-                Logger.info('Test server does not exist. Creating test server.')
-                Calabash::Android::Build::Builder.new(application_path).build
+                unless test_server.exists?
+                  Logger.info('Test server does not exist. Creating test server.')
+                  Calabash::Android::Build::Builder.new(application_path).build
+                end
               end
 
               enter_console(application_path)
             when '.ipa'
               set_platform!(:ios)