Merge "Remove FrameTracerTest from presubmit"
diff --git a/services/surfaceflinger/TEST_MAPPING b/services/surfaceflinger/TEST_MAPPING
index cab33ae..eed975e 100644
--- a/services/surfaceflinger/TEST_MAPPING
+++ b/services/surfaceflinger/TEST_MAPPING
@@ -1,7 +1,13 @@
{
"presubmit": [
{
- "name": "libsurfaceflinger_unittest"
+ "name": "libsurfaceflinger_unittest",
+ // TODO(b/148517641): re-enable once this test is fixed
+ "options": [
+ {
+ "exclude-filter": "FrameTracerTest.*"
+ }
+ ]
},
{
"name": "libcompositionengine_test"
diff --git a/services/surfaceflinger/tests/unittests/Android.bp b/services/surfaceflinger/tests/unittests/Android.bp
index d046f76..7681283 100644
--- a/services/surfaceflinger/tests/unittests/Android.bp
+++ b/services/surfaceflinger/tests/unittests/Android.bp
@@ -32,6 +32,7 @@
// 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
new file mode 100644
index 0000000..8e9c3cf
--- /dev/null
+++ b/services/surfaceflinger/tests/unittests/libsurfaceflinger_unittest.filter
@@ -0,0 +1,6 @@
+{
+ // TODO(b/148517641): re-enable once this test is fixed
+ "presubmit": {
+ "filter": "*:-FrameTracerTest.*"
+ }
+}