aboutsummaryrefslogtreecommitdiff
path: root/res/config/google
diff options
context:
space:
mode:
authorEric Rowe <erowe@google.com>2017-01-06 16:44:46 -0800
committerEric Rowe <erowe@google.com>2017-01-12 16:26:44 -0800
commit7b7f0206dbdd497ea077bd95a3f900cfbc8e3bcb (patch)
treeb38bbcd8e79125e3a61e3be50f1e954ba4beaf65 /res/config/google
parenta836d91e431761e78f49a1fed1ece3e27ea331ec (diff)
downloadcontrib-7b7f0206dbdd497ea077bd95a3f900cfbc8e3bcb.tar.gz
Remove unused config files.
This is a first pass to remove config files with no references in the google3 or the android repositories. To do this, I ran the following script from vendor/google_tradefed: /google/data/ro/users/er/erowe/scripts/rm_obsolete_configs.sh BUG=34131270 TEST=Ran script and verified a random sampling, checked output that there were no errors. Change-Id: I54605116a5999c1c31ccc101aa0d9ab0c489c7a4
Diffstat (limited to 'res/config/google')
-rw-r--r--res/config/google/test/framework/media/audio-jitter.xml18
-rw-r--r--res/config/google/test/framework/media/audio-walt-midi.xml20
-rw-r--r--res/config/google/test/framework/media/camera-func.xml16
-rw-r--r--res/config/google/test/framework/media/camera-latency.xml16
-rw-r--r--res/config/google/test/framework/media/camera-metadata.xml9
-rw-r--r--res/config/google/test/framework/media/camera-native.xml13
-rw-r--r--res/config/google/test/framework/media/camera-pairwise.xml16
-rw-r--r--res/config/google/test/framework/media/camera-settings.xml11
-rw-r--r--res/config/google/test/framework/media/camera-stress.xml11
-rw-r--r--res/config/google/test/framework/media/gcamera-startup.xml18
-rw-r--r--res/config/google/test/framework/media/gcamera-stress.xml18
-rw-r--r--res/config/google/test/framework/media/mse-eme-conformance.xml13
-rw-r--r--res/config/google/test/framework/media/mse-eme-progressive.xml14
-rw-r--r--res/config/google/test/framework/media/player-multimeter.xml22
-rw-r--r--res/config/google/test/framework/media/xts-media-cenc-offline.xml20
-rw-r--r--res/config/google/test/framework/media/xts-media-cenc.xml20
-rw-r--r--res/config/google/test/framework/media/xts-media.xml21
17 files changed, 0 insertions, 276 deletions
diff --git a/res/config/google/test/framework/media/audio-jitter.xml b/res/config/google/test/framework/media/audio-jitter.xml
deleted file mode 100644
index 3b1cb3d..0000000
--- a/res/config/google/test/framework/media/audio-jitter.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2014 Google Inc. All Rights Reserved -->
-<configuration description="Run audio jitter tests">
- <option name="test-tag" value="AudioJitter" />
-
- <!-- com.google.android.tradefed.targetprep.GoogleDeviceSetup -->
- <option name="google-device-setup:disable-audio" value="false"/>
- <option name="google-device-setup:screen-saver" value="off"/>
-
- <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
- <option name="push" value="/google/data/ro/teams/tradefed/testdata/media/sljitter->/data/local/tmp/sljitter" />
- </target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer" >
- <option name="run-command" value="chmod 755 /data/local/tmp/sljitter" />
- </target_preparer>
-
- <test class="com.android.media.tests.AudioJitterTest" />
-</configuration>
diff --git a/res/config/google/test/framework/media/audio-walt-midi.xml b/res/config/google/test/framework/media/audio-walt-midi.xml
deleted file mode 100644
index 047fd42..0000000
--- a/res/config/google/test/framework/media/audio-walt-midi.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2016 Google Inc. All Rights Reserved -->
-<configuration description="Run Audio WALT Test on device and get results">
-
- <target_preparer class="com.android.tradefed.targetprep.InstallApkSetup">
- <option name="apk-path" value="/google/data/ro/teams/tradefed/testdata/media/apps/walt.apk" />
- <option name="apk-path" value="/google/data/ro/teams/tradefed/testdata/media/apps/walt-permission.apk" />
- <option name="apk-path" value="/google/data/ro/teams/tradefed/testdata/media/apps/walt-permission-instrumentation.apk" />
- </target_preparer>
-
- <option name="test-tag" value="AudioWalt" />
- <option name="switch-script-path" value="/google/data/ro/teams/tradefed/testdata/media/scripts/walt-switch.py"/>
- <option name="permission-script-path" value="/google/data/ro/teams/tradefed/testdata/media/scripts/walt-permission.sh"/>
- <option name="test-type" value="MidiIn"/>
- <option name="fields" value="time_to_midi,time_total"/>
-
- <test class="com.google.android.media.tests.AudioWaltTest" />
-</configuration>
-
-
diff --git a/res/config/google/test/framework/media/camera-func.xml b/res/config/google/test/framework/media/camera-func.xml
deleted file mode 100644
index ef70a9b..0000000
--- a/res/config/google/test/framework/media/camera-func.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 Google Inc. All Rights Reserved -->
-<configuration description="Runs camera functional tests">
- <option name="test-tag" value="camera_functional_test" />
-
- <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
- <option name="test-file-name" value="mediaframeworktest.apk" />
- </target_preparer>
-
- <test class="com.android.tradefed.testtype.InstrumentationTest">
- <option name="class" value="com.android.mediaframeworktest.functional.camera.CameraFunctionalTest" />
- <option name="package" value="com.android.mediaframeworktest" />
- <option name="runner" value="com.android.mediaframeworktest.CameraStressTestRunner" />
- <option name="run-name" value="camera_functional_test" />
- </test>
-</configuration>
diff --git a/res/config/google/test/framework/media/camera-latency.xml b/res/config/google/test/framework/media/camera-latency.xml
deleted file mode 100644
index 92186a6..0000000
--- a/res/config/google/test/framework/media/camera-latency.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2011 Google Inc. All Rights Reserved -->
-<configuration description="Runs media stress tests">
- <option name="test-tag" value="camera_latency" />
-
- <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
- <option name="test-file-name" value="GoogleCameraTests.apk" />
- </target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
- <option name="push" value="/google/data/ro/teams/tradefed/testdata/media/com.google.android.GoogleCamera_media.xml->/data/data/com.google.android.GoogleCamera/shared_prefs/com.google.android.GoogleCamera_media.xml" />
- <option name="push" value="/google/data/ro/teams/tradefed/testdata/media/com.google.android.GoogleCamera_preferences_camera_0.xml->/data/data/com.google.android.GoogleCamera/shared_prefs/com.google.android.GoogleCamera_preferences_camera_0.xml" />
- <option name="push" value="/google/data/ro/teams/tradefed/testdata/media/com.google.android.GoogleCamera_preferences.xml->/data/data/com.google.android.GoogleCamera/shared_prefs/com.google.android.GoogleCamera_preferences.xml" />
- </target_preparer>
-
- <test class="com.android.media.tests.CameraLatencyTest" />
-</configuration>
diff --git a/res/config/google/test/framework/media/camera-metadata.xml b/res/config/google/test/framework/media/camera-metadata.xml
deleted file mode 100644
index 9c6b04d..0000000
--- a/res/config/google/test/framework/media/camera-metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2014 Google Inc. All Rights Reserved -->
-<configuration description="Runs media stress tests">
- <option name="test-tag" value="camera_metadata_tests" />
-
- <test class="com.android.tradefed.testtype.GTest">
- <option name="module-name" value="camera_metadata_tests" />
- </test>
-</configuration>
diff --git a/res/config/google/test/framework/media/camera-native.xml b/res/config/google/test/framework/media/camera-native.xml
deleted file mode 100644
index a4c3448..0000000
--- a/res/config/google/test/framework/media/camera-native.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 Google Inc. All Rights Reserved -->
-<configuration description="Runs media stress tests">
- <option name="test-tag" value="camera_native_test" />
-
- <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
- <option name="run-command" value="stop media"/>
- </target_preparer>
-
- <test class="com.android.tradefed.testtype.GTest">
- <option name="module-name" value="camera2_test" />
- </test>
-</configuration>
diff --git a/res/config/google/test/framework/media/camera-pairwise.xml b/res/config/google/test/framework/media/camera-pairwise.xml
deleted file mode 100644
index 597f7e1..0000000
--- a/res/config/google/test/framework/media/camera-pairwise.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 Google Inc. All Rights Reserved -->
-<configuration description="Runs camera pairwise tests">
- <option name="test-tag" value="camera_pairwise_test" />
-
- <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
- <option name="test-file-name" value="mediaframeworktest.apk" />
- </target_preparer>
-
- <test class="com.android.tradefed.testtype.InstrumentationTest">
- <option name="class" value="com.android.mediaframeworktest.functional.camera.CameraPairwiseTest" />
- <option name="package" value="com.android.mediaframeworktest" />
- <option name="runner" value="com.android.mediaframeworktest.CameraStressTestRunner" />
- <option name="run-name" value="camera_pairwise_test" />
- </test>
-</configuration>
diff --git a/res/config/google/test/framework/media/camera-settings.xml b/res/config/google/test/framework/media/camera-settings.xml
deleted file mode 100644
index 71b6dae..0000000
--- a/res/config/google/test/framework/media/camera-settings.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2012 Google Inc. All Rights Reserved -->
-<configuration description="Runs camera setting tests">
- <option name="test-tag" value="CameraStressSettings" />
-
- <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
- <option name="test-file-name" value="mediaframeworktest.apk" />
- </target_preparer>
-
- <test class="com.android.media.tests.CameraSettingsTest" />
-</configuration>
diff --git a/res/config/google/test/framework/media/camera-stress.xml b/res/config/google/test/framework/media/camera-stress.xml
deleted file mode 100644
index 9c31c76..0000000
--- a/res/config/google/test/framework/media/camera-stress.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2011 Google Inc. All Rights Reserved -->
-<configuration description="Runs media stress tests">
- <option name="test-tag" value="camera_stress" />
-
- <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
- <option name="test-file-name" value="GoogleCameraTests.apk" />
- </target_preparer>
-
- <test class="com.android.media.tests.CameraStressTest" />
-</configuration>
diff --git a/res/config/google/test/framework/media/gcamera-startup.xml b/res/config/google/test/framework/media/gcamera-startup.xml
deleted file mode 100644
index 4ccfbcc..0000000
--- a/res/config/google/test/framework/media/gcamera-startup.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2011 Google Inc. All Rights Reserved -->
-<configuration description="Runs media stress tests">
- <option name="test-tag" value="gcamera_startup" />
-
- <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
- <option name="test-file-name" value="GoogleCameraTests.apk" />
- </target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
- <option name="push" value="/google/data/ro/teams/tradefed/testdata/media/com.google.android.GoogleCamera_preferences_camera.xml->/data/data/com.google.android.GoogleCamera/shared_prefs/com.google.android.GoogleCamera_preferences_camera.xml" />
- <option name="push" value="/google/data/ro/teams/tradefed/testdata/media/com.google.android.GoogleCamera_preferences_0.xml->/data/data/com.google.android.GoogleCamera/shared_prefs/com.google.android.GoogleCamera_preferences_0.xml" />
- <option name="push" value="/google/data/ro/teams/tradefed/testdata/media/com.google.android.GoogleCamera_preferences.xml->/data/data/com.google.android.GoogleCamera/shared_prefs/com.google.android.GoogleCamera_preferences.xml" />
- </target_preparer>
-
- <test class="com.android.media.tests.CameraLatencyTest">
- <option name="gCam" value="true" />
- </test>
-</configuration>
diff --git a/res/config/google/test/framework/media/gcamera-stress.xml b/res/config/google/test/framework/media/gcamera-stress.xml
deleted file mode 100644
index 3fdee19..0000000
--- a/res/config/google/test/framework/media/gcamera-stress.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2011 Google Inc. All Rights Reserved -->
-<configuration description="Runs media stress tests">
- <option name="test-tag" value="gcamera_stress" />
-
- <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
- <option name="test-file-name" value="GoogleCameraTests.apk" />
- </target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
- <option name="push" value="/google/data/ro/teams/tradefed/testdata/media/com.google.android.GoogleCamera_preferences_camera.xml->/data/data/com.google.android.GoogleCamera/shared_prefs/com.google.android.GoogleCamera_preferences_camera.xml" />
- <option name="push" value="/google/data/ro/teams/tradefed/testdata/media/com.google.android.GoogleCamera_preferences_0.xml->/data/data/com.google.android.GoogleCamera/shared_prefs/com.google.android.GoogleCamera_preferences_0.xml" />
- <option name="push" value="/google/data/ro/teams/tradefed/testdata/media/com.google.android.GoogleCamera_preferences.xml->/data/data/com.google.android.GoogleCamera/shared_prefs/com.google.android.GoogleCamera_preferences.xml" />
- </target_preparer>
-
- <test class="com.android.media.tests.CameraStressTest">
- <option name="gCam" value="true" />
- </test>
-</configuration>
diff --git a/res/config/google/test/framework/media/mse-eme-conformance.xml b/res/config/google/test/framework/media/mse-eme-conformance.xml
deleted file mode 100644
index dff6b59..0000000
--- a/res/config/google/test/framework/media/mse-eme-conformance.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2014 Google Inc. All Rights Reserved -->
-<configuration description="Run MSE-EME conformance test on device and get results">
- <option name="test-tag" value="mse-eme-conformance" />
-
- <test class="com.google.android.apps.mediashell.CastReceiverTestRunner">
- <option name="run-name" value="mse-eme-conformance" />
- <option name="url-param" key="command" value="run" />
- <option name="url-param" key="timeout" value="30000" />
- <option name="test-count" value="70" />
- <option name="testrun-timeout" value="300" />
- </test>
-</configuration> \ No newline at end of file
diff --git a/res/config/google/test/framework/media/mse-eme-progressive.xml b/res/config/google/test/framework/media/mse-eme-progressive.xml
deleted file mode 100644
index 73f02ec..0000000
--- a/res/config/google/test/framework/media/mse-eme-progressive.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2014 Google Inc. All Rights Reserved -->
-<configuration description="Run MSE-EME progressive test on device and get results">
- <option name="test-tag" value="mse-eme-progressive" />
-
- <test class="com.google.android.apps.mediashell.CastReceiverTestRunner">
- <option name="run-name" value="mse-eme-progressive" />
- <option name="url-param" key="test_type" value="progressive-test" />
- <option name="url-param" key="command" value="run" />
- <option name="url-param" key="timeout" value="30000" />
- <option name="test-count" value="38" />
- <option name="testrun-timeout" value="300" />
- </test>
-</configuration> \ No newline at end of file
diff --git a/res/config/google/test/framework/media/player-multimeter.xml b/res/config/google/test/framework/media/player-multimeter.xml
deleted file mode 100644
index fd9a283..0000000
--- a/res/config/google/test/framework/media/player-multimeter.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2014 Google Inc. All Rights Reserved -->
-<configuration description="Run Video Multimeter test on device and get results">
- <option name="test-tag" value="VideoMultimeter" />
-
- <!-- com.google.android.tradefed.targetprep.GoogleDeviceSetup -->
- <option name="google-device-setup:screen-adaptive-brightness" value="off"/>
- <option name="google-device-setup:screen-brightness" value="230" />
- <option name="google-device-setup:auto-rotate" value="off" />
- <option name="google-device-setup:disable-audio" value="false" />
- <!-- TODO: Figure out how to turn volume up -->
-
- <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
- <option name="push" value="/google/data/ro/teams/tradefed/testdata/media/multimeter/video_calibration.mp4->/sdcard/DCIM/Camera/video_cali.mp4" />
- <option name="push" value="/google/data/ro/teams/tradefed/testdata/media/multimeter/video_1080p_30fps_10min_bbb.mp4->/sdcard/DCIM/Camera/video.mp4" />
- <option name="push" value="/google/data/ro/teams/tradefed/testdata/media/multimeter/video_720p_60fps_4min_mountham.mp4->/sdcard/DCIM/Camera/video2.mp4" />
- </target_preparer>
-
- <test class="com.android.media.tests.VideoMultimeterTest">
- <option name="multimeter-util-path" value="/google/data/ro/teams/tradefed/testdata/media/multimeter/optofi.sh" />
- </test>
-</configuration>
diff --git a/res/config/google/test/framework/media/xts-media-cenc-offline.xml b/res/config/google/test/framework/media/xts-media-cenc-offline.xml
deleted file mode 100644
index 8753bb5..0000000
--- a/res/config/google/test/framework/media/xts-media-cenc-offline.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration description="Runs xts offline media tests">
- <option name="test-tag" value="xts_media_offline_test" />
-
- <!-- com.google.android.tradefed.targetprep.GoogleDeviceSetup -->
- <option name="google-device-setup:screen-saver" value="off" />
-
- <target_preparer class="com.android.tradefed.targetprep.InstallApkSetup">
- <option name="apk-path" value="/google/data/ro/teams/tradefed/testdata/media/XtsMediaTestCases.apk" />
- </target_preparer>
-
- <test class="com.android.tradefed.testtype.InstrumentationTest">
- <option name="class" value="com.google.android.xts.media.MediaCodecCencOfflineTest" />
- <option name="package" value="com.google.android.xts.media" />
- <option name="runner" value="android.test.InstrumentationTestRunner" />
- <option name="run-name" value="xts_media_offline_test" />
- <option name="timeout" value="2000000" />
- <option name="bugreport-on-failure" value="EACH" />
- </test>
-</configuration>
diff --git a/res/config/google/test/framework/media/xts-media-cenc.xml b/res/config/google/test/framework/media/xts-media-cenc.xml
deleted file mode 100644
index 1c23738..0000000
--- a/res/config/google/test/framework/media/xts-media-cenc.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration description="Runs xts media tests">
- <option name="test-tag" value="xts_media_test" />
-
- <!-- com.google.android.tradefed.targetprep.GoogleDeviceSetup -->
- <option name="google-device-setup:screen-saver" value="off" />
-
- <target_preparer class="com.android.tradefed.targetprep.InstallApkSetup">
- <option name="apk-path" value="/google/data/ro/teams/tradefed/testdata/media/XtsMediaTestCases.apk" />
- </target_preparer>
-
- <test class="com.android.tradefed.testtype.InstrumentationTest">
- <option name="class" value="com.google.android.xts.media.MediaCodecCencTest" />
- <option name="package" value="com.google.android.xts.media" />
- <option name="runner" value="android.test.InstrumentationTestRunner" />
- <option name="run-name" value="xts_media_test" />
- <option name="timeout" value="2000000" />
- <option name="bugreport-on-failure" value="EACH" />
- </test>
-</configuration>
diff --git a/res/config/google/test/framework/media/xts-media.xml b/res/config/google/test/framework/media/xts-media.xml
deleted file mode 100644
index 3fa2517..0000000
--- a/res/config/google/test/framework/media/xts-media.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2012 Google Inc. All Rights Reserved -->
-<configuration description="Runs xts media tests">
- <option name="test-tag" value="xts_media_test" />
-
- <!-- com.google.android.tradefed.targetprep.GoogleDeviceSetup -->
- <option name="google-device-setup:screen-saver" value="off" />
-
- <target_preparer class="com.android.tradefed.targetprep.InstallApkSetup">
- <option name="apk-path" value="/google/data/ro/teams/tradefed/testdata/media/XtsMediaTestCases.apk" />
- </target_preparer>
-
- <test class="com.android.tradefed.testtype.InstrumentationTest">
- <option name="class" value="com.google.android.xts.media.MediaPlayerTest" />
- <option name="package" value="com.google.android.xts.media" />
- <option name="runner" value="android.test.InstrumentationTestRunner" />
- <option name="run-name" value="xts_media_test" />
- <option name="timeout" value="2000000" />
- <option name="bugreport-on-failure" value="EACH" />
- </test>
-</configuration>