Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Small tweaks to Tile Benchmark test"

Browse Source
This commit is contained in:
Guang Zhu
2012-01-06 11:21:07 -08:00
committed by Android (Google) Code Review
parent f4c2294b01 57420bf883
commit 128386ca9a
5 changed files with 8 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/TileBenchmark/Android.mk
View File

@@ -21,12 +21,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := TileBenchmark
include $(BUILD_PACKAGE)
LOCAL_MODULE_TAGS := tests
##################################################
include $(CLEAR_VARS)
LOCAL_JAVA_LIBRARIES := android.test.runner
include $(BUILD_MULTI_PREBUILT)
# Use the folloing include to make our test apk.
include $(call all-makefiles-under,$(LOCAL_PATH))
include $(BUILD_PACKAGE)

4
tests/TileBenchmark/AndroidManifest.xml
View File

@@ -18,5 +18,9 @@
android:label="@string/playback_activity"
android:theme="@android:style/Theme.Holo.NoActionBar">
</activity>
<uses-library android:name="android.test.runner" />
</application>
<instrumentation android:name="android.test.InstrumentationTestRunner"
android:targetPackage="com.test.tilebenchmark"
android:label="Tests for WebView Tiles."/>
</manifest>

2
tests/TileBenchmark/tests/src/com/test/tilebenchmark/PerformanceTest.java → tests/TileBenchmark/src/com/test/tilebenchmark/PerformanceTest.java
View File

@@ -80,7 +80,7 @@ public class PerformanceTest extends
private static final String URL_POSTFIX = "/index.html?skip=true";
private static final int MAX_ITERATIONS = 4;
private static final String TEST_DIRS[] = {
"intl1"//, "alexa_us", "android", "dom", "intl2", "moz", "moz2"
"alexa25_2011"//, "alexa_us", "android", "dom", "intl2", "moz", "moz2"
};
public PerformanceTest() {

16
tests/TileBenchmark/tests/Android.mk
View File

@@ -1,16 +0,0 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
# We only want this apk build for tests.
LOCAL_MODULE_TAGS := tests
LOCAL_JAVA_LIBRARIES := android.test.runner
# Include all test java files.
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := TileBenchmarkTests
LOCAL_INSTRUMENTATION_FOR := TileBenchmark
include $(BUILD_PACKAGE)

27
tests/TileBenchmark/tests/AndroidManifest.xml
View File

@@ -1,27 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2008 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.test.tilebenchmark.tests">
<application>
<uses-library android:name="android.test.runner" />
</application>
<instrumentation android:name="android.test.InstrumentationTestRunner"
android:targetPackage="com.test.tilebenchmark"
android:label="Tests for WebView Tiles."/>
</manifest>