diff options
| -rw-r--r-- | services/gpuservice/vts/AndroidTest.xml | 3 | ||||
| -rw-r--r-- | services/gpuservice/vts/src/com/android/tests/gpuservice/GpuWorkTracepointTest.java | 11 |
2 files changed, 8 insertions, 6 deletions
diff --git a/services/gpuservice/vts/AndroidTest.xml b/services/gpuservice/vts/AndroidTest.xml index 02ca07f968..34dc2eac06 100644 --- a/services/gpuservice/vts/AndroidTest.xml +++ b/services/gpuservice/vts/AndroidTest.xml @@ -14,6 +14,9 @@ limitations under the License. --> <configuration description="Runs GpuServiceVendorTests"> + <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"> + <option name="force-root" value="false" /> + </target_preparer> <test class="com.android.tradefed.testtype.HostTest" > <option name="jar" value="GpuServiceVendorTests.jar" /> </test> diff --git a/services/gpuservice/vts/src/com/android/tests/gpuservice/GpuWorkTracepointTest.java b/services/gpuservice/vts/src/com/android/tests/gpuservice/GpuWorkTracepointTest.java index 4a77d9ab92..9fa901675d 100644 --- a/services/gpuservice/vts/src/com/android/tests/gpuservice/GpuWorkTracepointTest.java +++ b/services/gpuservice/vts/src/com/android/tests/gpuservice/GpuWorkTracepointTest.java @@ -78,12 +78,11 @@ public class GpuWorkTracepointTest extends BaseHostJUnit4Test { "\tfield:unsigned char common_flags;\toffset:2;\tsize:1;\tsigned:0;", "\tfield:unsigned char common_preempt_count;\toffset:3;\tsize:1;\tsigned:0;", "\tfield:int common_pid;\toffset:4;\tsize:4;\tsigned:1;", - "\tfield:u32 uid;\toffset:8;\tsize:4;\tsigned:0;", - "\tfield:u32 frequency;\toffset:12;\tsize:4;\tsigned:0;", - "\tfield:u64 start_time;\toffset:16;\tsize:8;\tsigned:0;", - "\tfield:u64 end_time;\toffset:24;\tsize:8;\tsigned:0;", - "\tfield:u64 flags;\toffset:32;\tsize:8;\tsigned:0;", - "\tfield:u32 thermally_throttled_max_frequency_khz;\toffset:40;\tsize:4;\tsigned:0;" + "\tfield:u32 gpu_id;\toffset:8;\tsize:4;\tsigned:0;", + "\tfield:u32 uid;\toffset:12;\tsize:4;\tsigned:0;", + "\tfield:u64 start_time_ns;\toffset:16;\tsize:8;\tsigned:0;", + "\tfield:u64 end_time_ns;\toffset:24;\tsize:8;\tsigned:0;", + "\tfield:u64 total_active_duration_ns;\toffset:32;\tsize:8;\tsigned:0;" ); // We use |fail| rather than |assertEquals| because it allows us to give a clearer message. |