summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaman Tenneti <rtenneti@google.com>2019-08-16 12:59:03 -0700
committerRaman Tenneti <rtenneti@google.com>2019-08-16 13:03:23 -0700
commit61f391a7b82a616861758a652810fcffc43507f2 (patch)
treee35d6752c8fc4af8174bf049ff57ad7523289eef
parent147e6a9613fab326f3bf0a87df49488a4a79aaa1 (diff)
downloadCalendar-61f391a7b82a616861758a652810fcffc43507f2.tar.gz
AOSP/Calendar - Deleted TEST_MAPPING file and LOCAL_COMPATIBILITY_SUITE to fix bug 138793948.
BUG: 138793948 BUG: 138125109 Test: manual - Ran the following tests on Pixel phone. Tested the calendar UI. $ make -j 40 $ make Calendar -j $ make CalendarTests -j $ ls -l out/target/product/marlin/testcases/Calendar/arm64/Calendar.apk out/target/product/marlin/testcases/CalendarTests/arm64/CalendarTests.apk $ adb install -r -d -g out/target/product/marlin/testcases/Calendar/arm64/Calendar.apk $ adb install -r -d -g out/target/product/marlin/testcases/CalendarTests/arm64/CalendarTests.apk $ adb shell am instrument -w com.android.calendar.tests Time: 0.148 OK (22 tests) $ atest CalendarTests CalendarTests (22 Tests) ----------------------- [1/22] com.android.calendar.FormatDateRangeTest#testAll: PASSED (26ms) ... [22/22] com.android.calendar.widget.CalendarAppWidgetServiceTest#testGetAppWidgetModel_AllDayEventLater: PASSED (0ms) Summary ------- CalendarTests: Passed: 22, Failed: 0, Ignored: 0, Assumption Failed: 0 All tests passed! Change-Id: I4868a3bc54e8e3e026ec982f4b0b62ba413a8020
-rw-r--r--Android.mk2
-rw-r--r--TEST_MAPPING7
-rw-r--r--tests/Android.mk2
3 files changed, 0 insertions, 11 deletions
diff --git a/Android.mk b/Android.mk
index 27886cab..5cfdc85f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -35,8 +35,6 @@ LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs))
LOCAL_PACKAGE_NAME := Calendar
-LOCAL_COMPATIBILITY_SUITE := general-tests
-
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
LOCAL_PRODUCT_MODULE := true
diff --git a/TEST_MAPPING b/TEST_MAPPING
deleted file mode 100644
index 31049a6f..00000000
--- a/TEST_MAPPING
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "presubmit": [
- {
- "name": "CalendarTests"
- }
- ]
-}
diff --git a/tests/Android.mk b/tests/Android.mk
index 253b813d..bacb8c04 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -19,6 +19,4 @@ LOCAL_INSTRUMENTATION_FOR := Calendar
LOCAL_STATIC_JAVA_LIBRARIES := android-common
LOCAL_SDK_VERSION := 16
-LOCAL_COMPATIBILITY_SUITE := general-tests
-
include $(BUILD_PACKAGE)