ahmed/OpenCL-CTS
1
0
Fork 0
mirror of https://github.com/KhronosGroup/OpenCL-CTS.git synced 2026-03-19 06:09:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix test_printf build errors (#801)

Browse Source 
* Fix test_printf build errors

* Return error code in case of function failure
This commit is contained in:
Grzegorz Wawiorko
2020-06-10 20:03:09 +02:00
committed by GitHub
parent 782fe2c83b
commit e9dc1bc5d2
1 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
test_conformance/printf/test_printf.cpp
View File

@@ -59,7 +59,7 @@ static void printUsage( void );
//Stream helper functions //Stream helper functions
//Associate stdout stream with the file(gFileName):i.e redirect stdout stream to the specific files (gFileName) //Associate stdout stream with the file(gFileName):i.e redirect stdout stream to the specific files (gFileName)
static int acquireOutputStream(); static int acquireOutputStream(int* error);
//Close the file(gFileName) associated with the stdout stream and disassociates it. //Close the file(gFileName) associated with the stdout stream and disassociates it.
static void releaseOutputStream(int fd); static void releaseOutputStream(int fd);
@@ -141,10 +141,15 @@ static int getTempFileName()
//----------------------------------------- //-----------------------------------------
// acquireOutputStream // acquireOutputStream
//----------------------------------------- //-----------------------------------------
static int acquireOutputStream() static int acquireOutputStream(int* error)
{ {
int fd = streamDup(fileno(stdout)); int fd = streamDup(fileno(stdout));
freopen(gFileName,"w",stdout); *error = 0;
if (!freopen(gFileName, "w", stdout))
{
releaseOutputStream(fd);
*error = -1;
}
return fd; return fd;
} }
@@ -492,7 +497,12 @@ static int doTest(cl_command_queue queue, cl_context context, const unsigned int
} }
} }
fd = acquireOutputStream(); fd = acquireOutputStream(&err);
if (err != 0)
{
log_error("Error while redirection stdout to file");
goto exit;
}
globalWorkSize[0] = 1; globalWorkSize[0] = 1;
cl_event ndrEvt; cl_event ndrEvt;
err = clEnqueueNDRangeKernel(queue, kernel, 1, NULL, globalWorkSize, NULL, 0, NULL,&ndrEvt); err = clEnqueueNDRangeKernel(queue, kernel, 1, NULL, globalWorkSize, NULL, 0, NULL,&ndrEvt);
@@ -982,7 +992,12 @@ test_status InitCL( cl_device_id device )
uint32_t compute_devices = 0; uint32_t compute_devices = 0;
int err; int err;
gFd = acquireOutputStream(); gFd = acquireOutputStream(&err);
if (err != 0)
{
log_error("Error while redirection stdout to file");
return TEST_FAIL;
}
size_t config_size = sizeof( device_frequency ); size_t config_size = sizeof( device_frequency );
#if MULTITHREAD #if MULTITHREAD
@@ -1014,14 +1029,16 @@ test_status InitCL( cl_device_id device )
log_info( "Test binary built %s %s\n", __DATE__, __TIME__ ); log_info( "Test binary built %s %s\n", __DATE__, __TIME__ );
gFd = acquireOutputStream(); gFd = acquireOutputStream(&err);
if (err != 0)
cl_context_properties printf_properties[] = {
{ log_error("Error while redirection stdout to file");
CL_PRINTF_CALLBACK_ARM, (cl_context_properties)printfCallBack, return TEST_FAIL;
CL_PRINTF_BUFFERSIZE_ARM, ANALYSIS_BUFFER_SIZE, }
0 cl_context_properties printf_properties[] = {
}; CL_PRINTF_CALLBACK_ARM, (cl_context_properties)printfCallBack,
CL_PRINTF_BUFFERSIZE_ARM, ANALYSIS_BUFFER_SIZE, 0
};
cl_context_properties* props = NULL; cl_context_properties* props = NULL;