Remove WebRTC-specific test runner script for Android
After moving away from the Chromium checkout and the symlinks, we no longer need to have our own test_runner.py script for Android tests BUG=webrtc:5006 TBR=ehmaldonado@webrtc.org Review-Url: https://codereview.webrtc.org/2600193002 . Cr-Commit-Position: refs/heads/master@{#15801}
This commit is contained in:
parent
91ef546a79
commit
7d9305f473
@ -42,5 +42,3 @@ ignore_elf32_limitations = true
|
||||
# Use system Xcode installation instead of the Chromium bundled Mac toolchain,
|
||||
# since it contains only SDK 10.11, not 10.12 which WebRTC needs.
|
||||
use_system_xcode = true
|
||||
|
||||
android_test_runner_script = "../../webrtc/build/android/test_runner.py"
|
||||
|
||||
@ -763,9 +763,5 @@ if (is_android) {
|
||||
deps = [
|
||||
"//base:base_java",
|
||||
]
|
||||
|
||||
data = [
|
||||
"//webrtc/build/android/test_runner.py",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,38 +0,0 @@
|
||||
#!/usr/bin/env python
|
||||
# Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
|
||||
#
|
||||
# Use of this source code is governed by a BSD-style license
|
||||
# that can be found in the LICENSE file in the root of the source
|
||||
# tree. An additional intellectual property rights grant can be found
|
||||
# in the file PATENTS. All contributing project authors may
|
||||
# be found in the AUTHORS file in the root of the source tree.
|
||||
|
||||
"""
|
||||
Runs tests on Android devices.
|
||||
|
||||
This script exists to avoid WebRTC being broken by changes in the Chrome Android
|
||||
test execution toolchain. It also conveniently sets the CHECKOUT_SOURCE_ROOT
|
||||
environment variable.
|
||||
"""
|
||||
|
||||
import os
|
||||
import sys
|
||||
|
||||
SCRIPT_DIR = os.path.dirname(__file__)
|
||||
SRC_DIR = os.path.abspath(os.path.join(SCRIPT_DIR, os.pardir, os.pardir,
|
||||
os.pardir))
|
||||
CHROMIUM_BUILD_ANDROID_DIR = os.path.join(SRC_DIR, 'build', 'android')
|
||||
sys.path.insert(0, CHROMIUM_BUILD_ANDROID_DIR)
|
||||
|
||||
|
||||
import test_runner # pylint: disable=W0406
|
||||
|
||||
def main():
|
||||
# Override environment variable to make it possible for the scripts to find
|
||||
# the root directory (our symlinking of the Chromium build toolchain would
|
||||
# otherwise make them fail to do so).
|
||||
os.environ['CHECKOUT_SOURCE_ROOT'] = SRC_DIR
|
||||
return test_runner.main()
|
||||
|
||||
if __name__ == '__main__':
|
||||
sys.exit(main())
|
||||
@ -164,9 +164,6 @@ rtc_source_set("test_support") {
|
||||
|
||||
if (is_android) {
|
||||
deps += [ "//base:base" ]
|
||||
data = [
|
||||
"../build/android/test_runner.py",
|
||||
]
|
||||
}
|
||||
|
||||
if (rtc_use_memcheck) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user