diff options
| author | 2020-01-29 19:30:21 -0800 | |
|---|---|---|
| committer | 2020-01-29 20:27:16 -0800 | |
| commit | 078330fbd4e98bd4f30f5f68aea92bfa2530656c (patch) | |
| tree | c78045ee1598a465affa22fc7bca8bc346577e23 | |
| parent | 329f126bd5a78f66620dd0b113681e88192d51ed (diff) | |
Remove FrameTracerTest from presubmit
Right now they fail on the lab due to an atrace breakage. Disable these
tests while that breakage is sorted out.
Bug: 148517641
Test: presubmit
Change-Id: I6771afa39da4c023b316cdf705f0fc95ac34ab5a
| -rw-r--r-- | services/surfaceflinger/TEST_MAPPING | 8 | ||||
| -rw-r--r-- | services/surfaceflinger/tests/unittests/Android.bp | 1 | ||||
| -rw-r--r-- | services/surfaceflinger/tests/unittests/libsurfaceflinger_unittest.filter | 6 |
3 files changed, 14 insertions, 1 deletions
diff --git a/services/surfaceflinger/TEST_MAPPING b/services/surfaceflinger/TEST_MAPPING index cab33ae379..eed975e9bf 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 1eaf2dd004..010dc277b5 100644 --- a/services/surfaceflinger/tests/unittests/Android.bp +++ b/services/surfaceflinger/tests/unittests/Android.bp @@ -32,6 +32,7 @@ cc_test { // 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 0000000000..8e9c3cf705 --- /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.*" + } +} |