Revert "Remove FrameTracerTest from presubmit"
This reverts commit 078330fbd4e98bd4f30f5f68aea92bfa2530656c.
Reason for revert: Change I39f6d48ef3a8f50ad3b0f739ada7b64cbead7a3d re-links the full perfetto client library, so the test is no longer failing
Change-Id: I18ead6bebee3df5b3c6e10a0ffdab26fd6115fd0
diff --git a/services/surfaceflinger/TEST_MAPPING b/services/surfaceflinger/TEST_MAPPING
index eed975e..cab33ae 100644
--- a/services/surfaceflinger/TEST_MAPPING
+++ b/services/surfaceflinger/TEST_MAPPING
@@ -1,13 +1,7 @@
{
"presubmit": [
{
- "name": "libsurfaceflinger_unittest",
- // TODO(b/148517641): re-enable once this test is fixed
- "options": [
- {
- "exclude-filter": "FrameTracerTest.*"
- }
- ]
+ "name": "libsurfaceflinger_unittest"
},
{
"name": "libcompositionengine_test"
diff --git a/services/surfaceflinger/tests/unittests/Android.bp b/services/surfaceflinger/tests/unittests/Android.bp
index 010dc27..1eaf2dd 100644
--- a/services/surfaceflinger/tests/unittests/Android.bp
+++ b/services/surfaceflinger/tests/unittests/Android.bp
@@ -32,7 +32,6 @@
// option to false temporarily.
address: true,
},
- data: ["libsurfaceflinger_unittest.filter"],
srcs: [
":libsurfaceflinger_sources",
"libsurfaceflinger_unittest_main.cpp",
diff --git a/services/surfaceflinger/tests/unittests/libsurfaceflinger_unittest.filter b/services/surfaceflinger/tests/unittests/libsurfaceflinger_unittest.filter
deleted file mode 100644
index 8e9c3cf..0000000
--- a/services/surfaceflinger/tests/unittests/libsurfaceflinger_unittest.filter
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- // TODO(b/148517641): re-enable once this test is fixed
- "presubmit": {
- "filter": "*:-FrameTracerTest.*"
- }
-}