summaryrefslogtreecommitdiffstats
path: root/chrome/test/chromeos/autotest
diff options
context:
space:
mode:
authornirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-05 00:01:26 +0000
committernirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-05 00:01:26 +0000
commitdddc5f2f5d569ce50c0a9a0efa8c6914a76e979f (patch)
tree7923a894736521994bdbf8f7ef4692cd7c425822 /chrome/test/chromeos/autotest
parenta45fccc4ea2ed47b8a6658f68e39caab22a0a64e (diff)
downloadchromium_src-dddc5f2f5d569ce50c0a9a0efa8c6914a76e979f.zip
chromium_src-dddc5f2f5d569ce50c0a9a0efa8c6914a76e979f.tar.gz
chromium_src-dddc5f2f5d569ce50c0a9a0efa8c6914a76e979f.tar.bz2
Add new PyAuto autotest dependency
The existing chrome_test dependence is large (about 350MB on ARM). This new PyAuto dependency caters for cases where this functionality is needed within Chrome OS without all the rest of the Chrome tests. It is about 30MB. BUG=chromium-os:13288 TEST=manually copy files into autotest directory, check that run_remote_tests picks these up and that they operate correctly on a Seaboard with a trivial PyAuto test (see http://codereview.chromium.org/6766006/) This will ultimately be installed in the chroot by the chromeos-chrome ebuild. Review URL: http://codereview.chromium.org/6689027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80395 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/chromeos/autotest')
-rw-r--r--chrome/test/chromeos/autotest/files/client/deps/pyauto_dep/README6
-rw-r--r--chrome/test/chromeos/autotest/files/client/deps/pyauto_dep/common.py12
-rw-r--r--chrome/test/chromeos/autotest/files/client/deps/pyauto_dep/control5
-rwxr-xr-xchrome/test/chromeos/autotest/files/client/deps/pyauto_dep/pyauto_dep.py22
-rwxr-xr-xchrome/test/chromeos/autotest/files/client/deps/pyauto_dep/setup_test_links.sh17
5 files changed, 62 insertions, 0 deletions
diff --git a/chrome/test/chromeos/autotest/files/client/deps/pyauto_dep/README b/chrome/test/chromeos/autotest/files/client/deps/pyauto_dep/README
new file mode 100644
index 0000000..5f6b95b
--- /dev/null
+++ b/chrome/test/chromeos/autotest/files/client/deps/pyauto_dep/README
@@ -0,0 +1,6 @@
+# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+This dep brings PyAuto files into an image. Tests that depend on pyauto_dep
+should add this as a dep in their setup() method.
diff --git a/chrome/test/chromeos/autotest/files/client/deps/pyauto_dep/common.py b/chrome/test/chromeos/autotest/files/client/deps/pyauto_dep/common.py
new file mode 100644
index 0000000..a4fb1aa
--- /dev/null
+++ b/chrome/test/chromeos/autotest/files/client/deps/pyauto_dep/common.py
@@ -0,0 +1,12 @@
+# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import os, sys
+dirname = os.path.dirname(sys.modules[__name__].__file__)
+client_dir = os.path.abspath(os.path.join(dirname, "../../"))
+sys.path.insert(0, client_dir)
+import setup_modules
+sys.path.pop(0)
+setup_modules.setup(base_path=client_dir,
+ root_module_name="autotest_lib.client")
diff --git a/chrome/test/chromeos/autotest/files/client/deps/pyauto_dep/control b/chrome/test/chromeos/autotest/files/client/deps/pyauto_dep/control
new file mode 100644
index 0000000..b712264
--- /dev/null
+++ b/chrome/test/chromeos/autotest/files/client/deps/pyauto_dep/control
@@ -0,0 +1,5 @@
+# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+job.setup_dep(['pyauto_dep'])
diff --git a/chrome/test/chromeos/autotest/files/client/deps/pyauto_dep/pyauto_dep.py b/chrome/test/chromeos/autotest/files/client/deps/pyauto_dep/pyauto_dep.py
new file mode 100755
index 0000000..444d395
--- /dev/null
+++ b/chrome/test/chromeos/autotest/files/client/deps/pyauto_dep/pyauto_dep.py
@@ -0,0 +1,22 @@
+#!/usr/bin/python
+
+# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+"""Install the pyauto_dep dependency.
+
+This is done by the Chrome ebuild so this in fact has nothing to do.
+"""
+
+import os
+from autotest_lib.client.bin import utils
+
+version = 1
+
+def setup(top_dir):
+ return
+
+
+pwd = os.getcwd()
+utils.update_version(pwd + '/src', False, version, setup, None)
diff --git a/chrome/test/chromeos/autotest/files/client/deps/pyauto_dep/setup_test_links.sh b/chrome/test/chromeos/autotest/files/client/deps/pyauto_dep/setup_test_links.sh
new file mode 100755
index 0000000..038f094
--- /dev/null
+++ b/chrome/test/chromeos/autotest/files/client/deps/pyauto_dep/setup_test_links.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+#
+# Copyright (c) 2011 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.
+#
+# A script to setup symbolic links needed for Chrome's PyAuto framwork.
+
+ln -f -s /opt/google/chrome/chrome $(dirname $0)/chrome
+ln -f -s /opt/google/chrome/chrome.pak $(dirname $0)/chrome.pak
+ln -f -s /opt/google/chrome/locales $(dirname $0)/locales
+ln -f -s /opt/google/chrome/resources $(dirname $0)/resources
+ln -f -s /opt/google/chrome/resources.pak $(dirname $0)/resources.pak
+
+mkdir -p $(dirname $0)/chromeos
+ln -f -s /opt/google/chrome/chromeos/libcros.so \
+ $(dirname $0)/chromeos/libcros.so