summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Anton Hansson <hansson@google.com> 2020-03-23 15:08:51 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-03-23 15:08:51 +0000
commit1bc7758be2661a238a8108fd10c9f47fbda0a2fb (patch)
tree25a92e90722c6a48a9279ad23cc5245187f89440
parent63409a82270f6317bdbd30d1fdfbe48cb51d9e58 (diff)
parent177941f861e2a4b349963843e696e59afa321b00 (diff)
Merge "Move statsd TEST_MAPPINGS to statsd root" into rvc-dev am: d83682eab3 am: 177941f861
Change-Id: I9fb6bc578dc2ad5eb937618a8e0a8905a4a50c08
-rw-r--r--apex/statsd/TEST_MAPPING (renamed from apex/statsd/framework/test/TEST_MAPPING)3
-rw-r--r--apex/statsd/tests/libstatspull/TEST_MAPPING7
2 files changed, 3 insertions, 7 deletions
diff --git a/apex/statsd/framework/test/TEST_MAPPING b/apex/statsd/TEST_MAPPING
index f38795819189..93f108707d9e 100644
--- a/apex/statsd/framework/test/TEST_MAPPING
+++ b/apex/statsd/TEST_MAPPING
@@ -2,6 +2,9 @@
"presubmit" : [
{
"name" : "FrameworkStatsdTest"
+ },
+ {
+ "name" : "LibStatsPullTests"
}
]
}
diff --git a/apex/statsd/tests/libstatspull/TEST_MAPPING b/apex/statsd/tests/libstatspull/TEST_MAPPING
deleted file mode 100644
index 5e1178cffc05..000000000000
--- a/apex/statsd/tests/libstatspull/TEST_MAPPING
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "presubmit" : [
- {
- "name" : "LibStatsPullTests"
- }
- ]
-} \ No newline at end of file