Removing Bootup tests.
Change-Id: I34b47a901042b7beb43b6a2241b45db875620531
diff --git a/suite/pts/PtsBenchmarkingList.mk b/suite/pts/PtsBenchmarkingList.mk
index 7945f6d..6b97329 100644
--- a/suite/pts/PtsBenchmarkingList.mk
+++ b/suite/pts/PtsBenchmarkingList.mk
@@ -34,9 +34,8 @@
PtsDeviceOpenGl
PTS_HOST_CASES := \
- PtsHostBootup \
PtsHostUi \
PtsHostJank
pts_device_lib_tests := \
- PtsDeviceJank
\ No newline at end of file
+ PtsDeviceJank
diff --git a/suite/pts/hostTests/bootup/Android.mk b/suite/pts/hostTests/bootup/Android.mk
deleted file mode 100644
index 1872284..0000000
--- a/suite/pts/hostTests/bootup/Android.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (C) 2012 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.
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_MODULE := PtsHostBootup
-
-LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed-prebuilt ddmlib-prebuilt junit ptscommonutilhost
-
-LOCAL_CTS_TEST_PACKAGE := com.android.pts.bootup
-
-include $(BUILD_CTS_HOST_JAVA_LIBRARY)
-
diff --git a/suite/pts/hostTests/bootup/src/com/android/pts/bootup/BootupTimeTest.java b/suite/pts/hostTests/bootup/src/com/android/pts/bootup/BootupTimeTest.java
deleted file mode 100644
index d02b260..0000000
--- a/suite/pts/hostTests/bootup/src/com/android/pts/bootup/BootupTimeTest.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (C) 2012 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.
- */
-
-package com.android.pts.bootup;
-
-import android.cts.util.TimeoutReq;
-import com.android.pts.util.HostReportLog;
-import com.android.pts.util.MeasureRun;
-import com.android.pts.util.MeasureTime;
-import com.android.pts.util.ResultType;
-import com.android.pts.util.ResultUnit;
-import com.android.pts.util.ReportLog;
-import com.android.pts.util.Stat;
-import com.android.pts.util.Stat.StatResult;
-import com.android.tradefed.device.DeviceNotAvailableException;
-import com.android.tradefed.device.TestDeviceOptions;
-import com.android.tradefed.testtype.DeviceTestCase;
-
-/**
- * Measure reboot-time using adb shell reboot
- */
-public class BootupTimeTest extends DeviceTestCase {
- // add some delay before each reboot
- final static long SLEEP_BEFORE_REBOOT_TIME = 2 * 60 * 1000L;
- final static int REBOOT_TIMEOUT_MS = 10 * 60 * 1000;
-
- @TimeoutReq(minutes = 30)
- public void testBootupTime() throws Exception {
- // cannot run in emulator
- if (getDevice().getSerialNumber().startsWith("emulator-")) {
- return;
- }
- HostReportLog report =
- new HostReportLog(getDevice().getSerialNumber(), ReportLog.getClassMethodNames());
- final int NUMBER_REPEAT = 5;
- double[] result = MeasureTime.measure(NUMBER_REPEAT, new MeasureRun() {
- @Override
- public void prepare(int i) throws Exception {
- if (i == 0) {
- return;
- }
- Thread.sleep(SLEEP_BEFORE_REBOOT_TIME);
- }
- @Override
- public void run(int i) throws Exception {
- rebootDevice();
- }
- });
- report.printArray("bootup time", result, ResultType.LOWER_BETTER,
- ResultUnit.MS);
- StatResult stat = Stat.getStat(result);
- report.printSummary("bootup time", stat.mAverage, ResultType.LOWER_BETTER,
- ResultUnit.MS);
- report.deliverReportToHost();
- }
-
- private void rebootDevice() throws DeviceNotAvailableException {
- TestDeviceOptions options = getDevice().getOptions();
- // store default value and increase time-out for reboot
- int rebootTimeout = options.getRebootTimeout();
- long onlineTimeout = options.getOnlineTimeout();
- options.setRebootTimeout(REBOOT_TIMEOUT_MS);
- options.setOnlineTimeout(REBOOT_TIMEOUT_MS);
- getDevice().setOptions(options);
- getDevice().reboot();
- // restore default values
- options.setRebootTimeout(rebootTimeout);
- options.setOnlineTimeout(onlineTimeout);
- getDevice().setOptions(options);
- }
-}