summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgkanwar@chromium.org <gkanwar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-14 18:09:37 +0000
committergkanwar@chromium.org <gkanwar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-14 18:09:37 +0000
commitf3da04f7be479e17be39e466b6afb9f7de63fe44 (patch)
tree56524f284196e118475df134d8db7e93c128b1e1
parent67954f82d54c9e90c8668834e75853465d3493d3 (diff)
downloadchromium_src-f3da04f7be479e17be39e466b6afb9f7de63fe44.zip
chromium_src-f3da04f7be479e17be39e466b6afb9f7de63fe44.tar.gz
chromium_src-f3da04f7be479e17be39e466b6afb9f7de63fe44.tar.bz2
[Android] Removes run_* scripts, moves run_update_verificaiton
NOTRY=True BUG=223650 Review URL: https://chromiumcodereview.appspot.com/23106004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@217588 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--build/all_android.gyp4
-rwxr-xr-xbuild/android/run_browser_tests.py23
-rwxr-xr-xbuild/android/run_instrumentation_tests.py23
-rwxr-xr-xbuild/android/run_tests.py23
-rwxr-xr-xbuild/android/run_uiautomator_tests.py24
-rwxr-xr-xupdate_verification.py (renamed from build/android/run_update_verification.py)2
6 files changed, 3 insertions, 96 deletions
diff --git a/build/all_android.gyp b/build/all_android.gyp
index 0296580..2e3711e 100644
--- a/build/all_android.gyp
+++ b/build/all_android.gyp
@@ -40,8 +40,8 @@
{
# The current list of tests for android. This is temporary
# until the full set supported. If adding a new test here,
- # please also add it to build/android/run_tests.py, else the
- # test is not run.
+ # please also add it to build/android/pylib/gtest/gtest_config.py,
+ # else the test is not run.
#
# WARNING:
# Do not add targets here without communicating the implications
diff --git a/build/android/run_browser_tests.py b/build/android/run_browser_tests.py
deleted file mode 100755
index c536a29..0000000
--- a/build/android/run_browser_tests.py
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2013 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.
-
-"""Runs content_browsertests."""
-
-import logging
-import os
-import sys
-
-from pylib import cmd_helper
-
-
-if __name__ == '__main__':
- args = [os.path.join(os.path.dirname(__file__), 'test_runner.py'),
- 'gtest', '-s', 'content_browsertests'] + sys.argv[1:]
- logging.warning('*' * 80)
- logging.warning('This script is deprecated and will be removed soon.')
- logging.warning('Use the following instead: %s', ' '.join(args))
- logging.warning('*' * 80)
- sys.exit(1)
diff --git a/build/android/run_instrumentation_tests.py b/build/android/run_instrumentation_tests.py
deleted file mode 100755
index 7a9fa1e..0000000
--- a/build/android/run_instrumentation_tests.py
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env python
-#
-# 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.
-
-"""Runs both the Python and Java instrumentation tests."""
-
-import logging
-import os
-import sys
-
-from pylib import cmd_helper
-
-
-if __name__ == '__main__':
- args = [os.path.join(os.path.dirname(__file__), 'test_runner.py'),
- 'instrumentation'] + sys.argv[1:]
- logging.warning('*' * 80)
- logging.warning('This script is deprecated and will be removed soon.')
- logging.warning('Use the following instead: %s', ' '.join(args))
- logging.warning('*' * 80)
- sys.exit(1)
diff --git a/build/android/run_tests.py b/build/android/run_tests.py
deleted file mode 100755
index 59118cf..0000000
--- a/build/android/run_tests.py
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright (c) 2013 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.
-
-"""Runs all the native unit tests."""
-
-import logging
-import os
-import sys
-
-from pylib import cmd_helper
-
-
-if __name__ == '__main__':
- args = [os.path.join(os.path.dirname(__file__), 'test_runner.py'),
- 'gtest'] + sys.argv[1:]
- logging.warning('*' * 80)
- logging.warning('This script is deprecated and will be removed soon.')
- logging.warning('Use the following instead: %s', ' '.join(args))
- logging.warning('*' * 80)
- sys.exit(1)
diff --git a/build/android/run_uiautomator_tests.py b/build/android/run_uiautomator_tests.py
deleted file mode 100755
index 4a94a83..0000000
--- a/build/android/run_uiautomator_tests.py
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright (c) 2013 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.
-
-"""Runs both the Python and Java UIAutomator tests."""
-
-import logging
-import os
-import sys
-
-from pylib import cmd_helper
-
-
-if __name__ == '__main__':
- args = ['python',
- os.path.join(os.path.dirname(__file__), 'test_runner.py'),
- 'uiautomator'] + sys.argv[1:]
- logging.warning('*' * 80)
- logging.warning('This script is deprecated and will be removed soon.')
- logging.warning('Use the following instead: %s', ' '.join(args))
- logging.warning('*' * 80)
- sys.exit(cmd_helper.RunCmd(args))
diff --git a/build/android/run_update_verification.py b/update_verification.py
index 5f62f3e..0c349c3 100755
--- a/build/android/run_update_verification.py
+++ b/update_verification.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Copyright (c) 2013 The Chromium Authors. All rights reserved.
+# Copyright 2013 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.