Update testing tools (AppRTC, Go) to new versions
App engine is included in the AppRTC archive, so the separate archive is not needed anymore.
Mercurial is no longer necessary to include but it will be required during the vendoring step when the prebuilt archives are update.
The download/build scripts have been simplified accordingly.
The video quality test has been updated to work with the new appengine.
BUG=webrtc:7602
Review-Url: https://codereview.webrtc.org/2882073003
Cr-Commit-Position: refs/heads/master@{#18162}
diff --git a/webrtc/tools/testing/setup_apprtc.py b/webrtc/tools/testing/setup_apprtc.py
old mode 100644
new mode 100755
index 801da73..697d503
--- a/webrtc/tools/testing/setup_apprtc.py
+++ b/webrtc/tools/testing/setup_apprtc.py
@@ -22,30 +22,22 @@
SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
+
def main(argv):
if len(argv) == 1:
return 'Usage %s <output_dir>' % argv[0]
- output_dir = argv[1]
- apprtc_appengine_mercurial_path = os.path.join(
- SCRIPT_DIR, 'download_apprtc_appengine_and_mercurial.py')
- utils.RunSubprocessWithRetry([apprtc_appengine_mercurial_path,
- output_dir])
+ output_dir = os.path.abspath(argv[1])
- download_golang_path = os.path.join(SCRIPT_DIR, 'download_golang.py')
- utils.RunSubprocessWithRetry([download_golang_path, output_dir])
+ download_apprtc_path = os.path.join(SCRIPT_DIR, 'download_apprtc.py')
+ utils.RunSubprocessWithRetry([download_apprtc_path, output_dir])
- build_mercurial_path = os.path.join(SCRIPT_DIR, 'build_mercurial_local.py')
- hg_dir = os.path.join(output_dir, 'mercurial')
- utils.RunSubprocessWithRetry([build_mercurial_path, hg_dir])
-
- build_apprtc_collider_path = os.path.join(SCRIPT_DIR,
- 'build_apprtc_collider.py')
+ build_apprtc_path = os.path.join(SCRIPT_DIR, 'build_apprtc.py')
apprtc_src_dir = os.path.join(output_dir, 'apprtc', 'src')
go_dir = os.path.join(output_dir, 'go')
collider_dir = os.path.join(output_dir, 'collider')
- utils.RunSubprocessWithRetry([build_apprtc_collider_path, apprtc_src_dir,
- go_dir, hg_dir, collider_dir])
+ utils.RunSubprocessWithRetry([build_apprtc_path, apprtc_src_dir,
+ go_dir, collider_dir])
if __name__ == '__main__':