| Index: build/android/pylib/chrome_test_server_spawner.py
|
| diff --git a/build/android/chrome_test_server_spawner.py b/build/android/pylib/chrome_test_server_spawner.py
|
| similarity index 95%
|
| rename from build/android/chrome_test_server_spawner.py
|
| rename to build/android/pylib/chrome_test_server_spawner.py
|
| index 85864dada7460517959fd3fb1f5f9a3590902884..75a61c1a67ae42f1052197d1c0f9069e0a34fd06 100644
|
| --- a/build/android/chrome_test_server_spawner.py
|
| +++ b/build/android/pylib/chrome_test_server_spawner.py
|
| @@ -1,4 +1,4 @@
|
| -# Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| +# Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| # Use of this source code is governed by a BSD-style license that can be
|
| # found in the LICENSE file.
|
|
|
| @@ -17,12 +17,12 @@ import time
|
| import urlparse
|
|
|
| # Path that are needed to import testserver
|
| -cr_src = os.path.join(os.path.abspath(os.path.dirname(__file__)), '..', '..')
|
| +cr_src = os.path.join(os.path.abspath(os.path.dirname(__file__)),
|
| + '..', '..', '..')
|
| sys.path.append(os.path.join(cr_src, 'third_party'))
|
| sys.path.append(os.path.join(cr_src, 'third_party', 'tlslite'))
|
| sys.path.append(os.path.join(cr_src, 'third_party', 'pyftpdlib', 'src'))
|
| -sys.path.append(os.path.join(os.path.abspath(os.path.dirname(__file__)), '..',
|
| - '..', 'net', 'tools', 'testserver'))
|
| +sys.path.append(os.path.join(cr_src, 'net', 'tools', 'testserver'))
|
| import testserver
|
|
|
| _test_servers = []
|
|
|