Refactor ULT, dont create parameterized tests for single config tests

Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski
2020-12-02 12:43:54 +00:00
committed by Compute-Runtime-Automation
parent cb14f0969d
commit ff027615c9
12 changed files with 130 additions and 160 deletions

View File

@@ -21,17 +21,19 @@ namespace NEO {
// ProgramFromBinaryTest Test Fixture
// Used to test the Program class
////////////////////////////////////////////////////////////////////////////////
class ProgramFromBinaryTest : public ClDeviceFixture,
public ContextFixture,
public ProgramFixture,
public testing::TestWithParam<std::tuple<const char *, const char *>> {
struct ProgramFromBinaryFixture : public ClDeviceFixture,
public ContextFixture,
public ProgramFixture,
public testing::Test {
using ContextFixture::SetUp;
protected:
void SetUp() override {
std::tie(BinaryFileName, kernelName) = GetParam();
ProgramFromBinaryFixture::SetUp("CopyBuffer_simd32", "CopyBuffer");
}
void SetUp(const char *binaryFileName, const char *kernelName) {
this->binaryFileName = binaryFileName;
this->kernelName = kernelName;
ClDeviceFixture::SetUp();
cl_device_id device = pClDevice;
@@ -39,9 +41,9 @@ class ProgramFromBinaryTest : public ClDeviceFixture,
ProgramFixture::SetUp();
if (options.size())
CreateProgramFromBinary(pContext, pContext->getDevices(), BinaryFileName, options);
CreateProgramFromBinary(pContext, pContext->getDevices(), binaryFileName, options);
else
CreateProgramFromBinary(pContext, pContext->getDevices(), BinaryFileName);
CreateProgramFromBinary(pContext, pContext->getDevices(), binaryFileName);
}
void TearDown() override {
@@ -55,7 +57,7 @@ class ProgramFromBinaryTest : public ClDeviceFixture,
options = optionsIn;
}
const char *BinaryFileName = nullptr;
const char *binaryFileName = nullptr;
const char *kernelName = nullptr;
cl_int retVal = CL_SUCCESS;
std::string options;