Merge "Prepare TEST_MAPPING for presubmit tests" (972199ea) · Commits · e / os / android_frameworks_av

media/codec2/TEST_MAPPING

+6 −21

Original line number	Original line	Diff line number	Diff line
	{		{
	"presubmit": [		"postsubmit": [
	{		{
	"name": "GtsMediaTestCases",		// TODO: move to presubmit once we verify the tests are not flaky
			"name": "CtsMediaTestCases",
	"options": [		"options": [
	{		{
	"include-annotation": "android.platform.test.annotations.Presubmit"		"include-annotation": "android.platform.test.annotations.Presubmit"
	},		},
	{		{
	"include-filter": "com.google.android.media.gts.WidevineGenericOpsTests"		"exclude-annotation": "android.platform.test.annotations.RequiresDevice"
	}		}
	]		]
	},
	{
	"name": "GtsExoPlayerTestCases",
	"options" : [
	{
	"include-annotation": "android.platform.test.annotations.SocPresubmit"
	},
	{
	"include-filter": "com.google.android.exoplayer.gts.DashTest#testWidevine23FpsH264Fixed"
	}
	]
	}
	],
	"imports": [
	{
	"path": "frameworks/av/drm/mediadrm/plugins"
	}		}
	]		]
	}		}

+5 −1

Original line number	Original line	Diff line number	Diff line
	{		{
	"postsubmit": [		"postsubmit": [
	{		{
			// TODO: move to presubmit once we verify the tests are not flaky
	"name": "CtsMediaTestCases",		"name": "CtsMediaTestCases",
	"options": [		"options": [
	{		{
	"include-annotation": "android.platform.test.annotations.RequiresDevice"		"include-annotation": "android.platform.test.annotations.Presubmit"
			},
			{
			"exclude-annotation": "android.platform.test.annotations.RequiresDevice"
	}		}
	]		]
	},		},