Skip to content

Commit 64199fb

Browse files
kocdemirAndroid Build Cherrypicker Worker
authored andcommitted
Annotate GpuWorkTracepointTest with RequiresDevice
GpuWorkTracepointTest test requires GPU driver to generate kernel tracepoint events which should only be tested with real devices, but not with emulators. Replacing RestrictedBuildTest annotation with RequiresDevice to correctly indicate this. Bug: b/352538275 Test: atest GpuWorkTracepointTest Flag: EXEMPT test fix (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9f249a41399c45d5b77c139051dd93bff80cfcf1) Merged-In: I57f5f035a6ea7ac12e6fb6c619385af75defda2a Change-Id: I57f5f035a6ea7ac12e6fb6c619385af75defda2a Bug: 381335775
1 parent d0469c5 commit 64199fb

2 files changed

Lines changed: 9 additions & 3 deletions

File tree

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
{
22
"presubmit": [
33
{
4-
"name": "GpuServiceVendorTests"
4+
"name": "GpuServiceVendorTests",
5+
"options": [
6+
{
7+
// Exclude test methods that require a physical device to run.
8+
"exclude-annotation": "android.platform.test.annotations.RequiresDevice"
9+
}
10+
]
511
}
612
]
713
}

services/gpuservice/vts/src/com/android/tests/gpuservice/GpuWorkTracepointTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import static org.junit.Assert.fail;
2020
import static org.junit.Assume.assumeTrue;
2121

22-
import android.platform.test.annotations.RestrictedBuildTest;
22+
import android.platform.test.annotations.RequiresDevice;
2323

2424
import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
2525
import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test;
@@ -63,7 +63,7 @@ public void testReadTracingEvents() throws Exception {
6363
}
6464

6565
@VsrTest(requirements={"VSR-3.3-004"})
66-
@RestrictedBuildTest
66+
@RequiresDevice
6767
@Test
6868
public void testGpuWorkPeriodTracepointFormat() throws Exception {
6969
CommandResult commandResult = getDevice().executeShellV2Command(

0 commit comments

Comments
 (0)