From 97b5df764344c32f8551483385ac4be742427580 Mon Sep 17 00:00:00 2001 From: Mårten Kongstad Date: Fri, 7 Nov 2014 10:39:20 +0100 Subject: RRO tests: adapt tests to split apks The introduction of support for split apks has resulted in the move of applications from /partition/app/pkg.apk to /partition/app/pkg/pkg.apk. Update the RRO testrunner to use the new paths. Bug: 17765434 Change-Id: I6eebfb6f879404077b9447c750ddc395ecd9a547 --- core/tests/overlaytests/testrunner.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/core/tests/overlaytests/testrunner.py b/core/tests/overlaytests/testrunner.py index 4f94373d5b19..3703f4a4b7ca 100755 --- a/core/tests/overlaytests/testrunner.py +++ b/core/tests/overlaytests/testrunner.py @@ -421,8 +421,8 @@ def _create_enable_single_overlay_task(): _create_disable_overlays_task(), MkdirTask('/system/vendor'), MkdirTask('/vendor/overlay'), - PushTask('/data/app/com.android.overlaytest.overlay.apk', '/vendor/overlay/framework_a.apk'), - PushTask('/data/app/com.android.overlaytest.first_app_overlay.apk', '/vendor/overlay/app_a.apk'), + PushTask('/data/app/com.android.overlaytest.overlay/com.android.overlaytest.overlay.apk', '/vendor/overlay/framework_a.apk'), + PushTask('/data/app/com.android.overlaytest.first_app_overlay/com.android.overlaytest.first_app_overlay.apk', '/vendor/overlay/app_a.apk'), ] return CompoundTask(TASK_ENABLE_SINGLE_OVERLAY, tasks) @@ -432,9 +432,9 @@ def _create_enable_multiple_overlays_task(): MkdirTask('/system/vendor'), MkdirTask('/vendor/overlay'), - PushTask('/data/app/com.android.overlaytest.overlay.apk', '/vendor/overlay/framework_b.apk'), - PushTask('/data/app/com.android.overlaytest.first_app_overlay.apk', '/vendor/overlay/app_a.apk'), - PushTask('/data/app/com.android.overlaytest.second_app_overlay.apk', '/vendor/overlay/app_b.apk'), + PushTask('/data/app/com.android.overlaytest.overlay/com.android.overlaytest.overlay.apk', '/vendor/overlay/framework_b.apk'), + PushTask('/data/app/com.android.overlaytest.first_app_overlay/com.android.overlaytest.first_app_overlay.apk', '/vendor/overlay/app_a.apk'), + PushTask('/data/app/com.android.overlaytest.second_app_overlay/com.android.overlaytest.second_app_overlay.apk', '/vendor/overlay/app_b.apk'), ] return CompoundTask(TASK_ENABLE_MULTIPLE_OVERLAYS, tasks) @@ -584,7 +584,7 @@ if __name__ == '__main__': # remount filesystem, install test project tasks.append(RootTask()) tasks.append(RemountTask()) - tasks.append(PushTask('/system/app/OverlayTest.apk', '/system/app/OverlayTest.apk')) + tasks.append(PushTask('/system/app/OverlayTest/OverlayTest.apk', '/system/app/OverlayTest.apk')) # test idmap if opts.test_idmap: @@ -609,9 +609,9 @@ if __name__ == '__main__': tasks.append(GrepIdmapTest(idmap, 'bool/config_annoy_dianne', 1)) # overlays.list - overlays_list_path = '/data/resource-cache/overlays.list' + overlays_list_path = idmaps + '/overlays.list' expected_content = '''\ -/vendor/overlay/framework_b.apk /data/resource-cache/vendor@overlay@framework_b.apk@idmap +/vendor/overlay/framework_b.apk /data/local/tmp/idmaps/vendor@overlay@framework_b.apk@idmap ''' tasks.append(FileExistsTest(overlays_list_path)) tasks.append(Md5Test(overlays_list_path, expected_content)) -- cgit v1.2.3-59-g8ed1b