Change HWCMDTEST_F() tests to HWTEST_F() where possible

Change-Id: Ibfe147a12b53f832723f83809770e1b203159f8f
Signed-off-by: Filip Hazubski <filip.hazubski@intel.com>
This commit is contained in:
Filip Hazubski
2018-10-01 11:57:36 +02:00
committed by sys_ocldev
parent 6dfcb913f0
commit c75dc23b6e
31 changed files with 124 additions and 118 deletions

View File

@@ -88,7 +88,7 @@ struct TwoOOQsTwoDependentWalkers : public HelloWorldTest<OOQFixtureFactory>,
delete E1;
delete E2;
typedef typename FamilyType::GPGPU_WALKER GPGPU_WALKER;
typedef typename FamilyType::WALKER_TYPE GPGPU_WALKER;
itorWalker1 = find<GPGPU_WALKER *>(cmdList.begin(), cmdList.end());
ASSERT_NE(cmdList.end(), itorWalker1);
@@ -103,12 +103,12 @@ struct TwoOOQsTwoDependentWalkers : public HelloWorldTest<OOQFixtureFactory>,
CommandQueue *pCmdQ2 = nullptr;
};
HWCMDTEST_F(IGFX_GEN8_CORE, TwoOOQsTwoDependentWalkers, shouldHaveTwoWalkers) {
HWTEST_F(TwoOOQsTwoDependentWalkers, shouldHaveTwoWalkers) {
parseWalkers<FamilyType>();
EXPECT_NE(itorWalker1, itorWalker2);
}
HWCMDTEST_F(IGFX_GEN8_CORE, TwoOOQsTwoDependentWalkers, shouldHaveOnePS) {
HWTEST_F(TwoOOQsTwoDependentWalkers, shouldHaveOnePS) {
parseWalkers<FamilyType>();
int numCommands = getNumberOfPipelineSelectsThatEnablePipelineSelect<FamilyType>();
EXPECT_EQ(1, numCommands);
@@ -121,7 +121,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, TwoOOQsTwoDependentWalkers, shouldHaveOneVFEState) {
EXPECT_EQ(1u, numCommands);
}
HWCMDTEST_F(IGFX_GEN8_CORE, TwoOOQsTwoDependentWalkers, shouldHaveAPipecontrolBetweenWalkers) {
HWTEST_F(TwoOOQsTwoDependentWalkers, shouldHaveAPipecontrolBetweenWalkers) {
typedef typename FamilyType::PIPE_CONTROL PIPE_CONTROL;
parseWalkers<FamilyType>();