diff options
| author | Zhigang Gong <zhigang.gong@intel.com> | 2014-01-14 09:33:00 +0800 |
|---|---|---|
| committer | Zhigang Gong <zhigang.gong@intel.com> | 2014-01-14 09:36:38 +0800 |
| commit | a979dcc2f4290f9c39459abbee0eca9adbcdff4c (patch) | |
| tree | b691d21c706a67b16b57e5f38ebf73daa46c1c52 /utests | |
| parent | e427b3eac67a9513eae4a0d352ed94d798cc7334 (diff) | |
Revert faulty pushed patchset
This reverts:
Revert "GBE: fixed a long related bug."
Revert "Refine the method to find pch and pcm files."
Revert "GBE: enable relocatable pch files."
Revert "CL: prepare to support ICD if the system has ocl-icd.."
Revert "CL: back port ICD support to 1.1 branch."
The above patches are merged by accident without review comments and
are broken. Now revert them.
Diffstat (limited to 'utests')
| -rw-r--r-- | utests/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | utests/utest.cpp | 2 |
2 files changed, 5 insertions, 8 deletions
diff --git a/utests/CMakeLists.txt b/utests/CMakeLists.txt index 8c64844b..b1f0b52f 100644 --- a/utests/CMakeLists.txt +++ b/utests/CMakeLists.txt @@ -12,11 +12,6 @@ string(REGEX REPLACE "generated/([^\ ]*)\\.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/../ string(REGEX REPLACE " " ";" KERNEL_MATH_LIST ${KERNEL_MATH_LIST}) set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "generated;${KERNEL_MATH_LIST}") -configure_file ( - "setenv.sh.in" - "setenv.sh" - ) - link_directories (${LLVM_LIBRARY_DIR}) set (utests_sources utest_error.c @@ -175,7 +170,7 @@ set (utests_sources SET (kernel_bin ${CMAKE_CURRENT_SOURCE_DIR}/../kernels/compiler_ceil) ADD_CUSTOM_COMMAND( OUTPUT ${kernel_bin}.bin - COMMAND ${GBE_BIN_GENERATER} ${kernel_bin}.cl -o${kernel_bin}.bin + COMMAND ${CMAKE_CURRENT_BINARY_DIR}/../backend/src/gbe_bin_generater ${kernel_bin}.cl -o${kernel_bin}.bin DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/../backend/src/gbe_bin_generater ${kernel_bin}.cl ) @@ -194,8 +189,8 @@ add_custom_target(utest_generator if (EGL_FOUND AND MESA_SOURCE_FOUND) SET(utests_sources ${utests_sources} compiler_fill_gl_image.cpp) -SET(CMAKE_CXX_FLAGS "-DHAS_EGL ${CMAKE_CXX_FLAGS} ${DEF_OCL_PCH_PCM_PATH}") -SET(CMAKE_C_FLAGS "-DHAS_EGL ${CMAKE_C_FLAGS} ${DEF_OCL_PCH_PCM_PATH}") +SET(CMAKE_CXX_FLAGS "-DHAS_EGL ${CMAKE_CXX_FLAGS}") +SET(CMAKE_C_FLAGS "-DHAS_EGL ${CMAKE_C_FLAGS}") endif (EGL_FOUND AND MESA_SOURCE_FOUND) ADD_LIBRARY(utests SHARED ${ADDMATHFUNC} ${utests_sources}) diff --git a/utests/utest.cpp b/utests/utest.cpp index 718916f1..6d51598a 100644 --- a/utests/utest.cpp +++ b/utests/utest.cpp @@ -41,6 +41,8 @@ UTest::UTest(Function fn, const char *name, bool haveIssue, bool needDestroyProg utestList->push_back(*this); } +UTest::UTest(void) : fn(NULL), name(NULL), haveIssue(false) {} + static bool strequal(const char *s1, const char *s2) { if (strcmp(s1, s2) == 0) return true; return false; |