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

Fix return-type warnings with harness library and basic test (#776)

Browse Source 
* Fix offending `-Wreturn-type` in harness library

* Fix offending `-Wreturn-type` in basic test
This commit is contained in:
Ankit Goyal
2020-05-18 17:33:17 +05:30
committed by GitHub
parent 3afe926416
commit 833f0d029e
3 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test_common/harness/deviceInfo.h
View File

@@ -30,6 +30,10 @@ extern "C" {
/* Determines if an extension is supported by a device. */ /* Determines if an extension is supported by a device. */
int is_extension_available(cl_device_id device, const char *extensionName); int is_extension_available(cl_device_id device, const char *extensionName);
#ifdef __cplusplus
}
#endif // __cplusplus
/* Returns a string containing the supported extensions list for a device. */ /* Returns a string containing the supported extensions list for a device. */
std::string get_device_extensions_string(cl_device_id device); std::string get_device_extensions_string(cl_device_id device);
@@ -39,8 +43,4 @@ std::string get_device_il_version_string(cl_device_id device);
/* Returns a string containing the supported OpenCL version for a device. */ /* Returns a string containing the supported OpenCL version for a device. */
std::string get_device_version_string(cl_device_id device); std::string get_device_version_string(cl_device_id device);
#ifdef __cplusplus
}
#endif // __cplusplus
#endif // _deviceInfo_h #endif // _deviceInfo_h

32
test_common/harness/testHarness.h
View File

@@ -23,16 +23,6 @@
#include <string> #include <string>
#ifdef __cplusplus
extern "C" {
#endif
#define ADD_TEST(fn) {test_##fn, #fn, Version(1, 0)}
#define ADD_TEST_VERSION(fn, ver) {test_##fn, #fn, ver}
#define NOT_IMPLEMENTED_TEST(fn) {NULL, #fn, Version(0, 0)}
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
class Version class Version
{ {
public: public:
@@ -56,6 +46,27 @@ private:
int m_minor; int m_minor;
}; };
Version get_device_cl_version(cl_device_id device);
#ifdef __cplusplus
extern "C" {
#endif
#define ADD_TEST(fn) \
{ \
test_##fn, #fn, Version(1, 0) \
}
#define ADD_TEST_VERSION(fn, ver) \
{ \
test_##fn, #fn, ver \
}
#define NOT_IMPLEMENTED_TEST(fn) \
{ \
NULL, #fn, Version(0, 0) \
}
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
typedef struct test_definition typedef struct test_definition
{ {
basefn func; basefn func;
@@ -128,7 +139,6 @@ extern cl_device_type GetDeviceType( cl_device_id );
// is the only device available, the SAME device is returned, so check! // is the only device available, the SAME device is returned, so check!
extern cl_device_id GetOpposingDevice( cl_device_id device ); extern cl_device_id GetOpposingDevice( cl_device_id device );
Version get_device_cl_version(cl_device_id device);
void version_expected_info(const char * test_name, const char * expected_version, const char * device_version); void version_expected_info(const char * test_name, const char * expected_version, const char * device_version);

1
test_conformance/basic/test_progvar.cpp
View File

@@ -599,6 +599,7 @@ static const TypeInfo& l_find_type( const char* name )
if ( 0 == strcmp( name, type_info[i].get_name_c_str() ) ) return type_info[i]; if ( 0 == strcmp( name, type_info[i].get_name_c_str() ) ) return type_info[i];
} }
assert(0); assert(0);
return TypeInfo();
} }