[Bf-blender-cvs] [dd1fc26] gtest-testing: stub out binreloc
Campbell Barton
noreply at git.blender.org
Mon May 19 09:21:09 CEST 2014
Commit: dd1fc26000af7f06b4a0eb0e9629eaccaa6adae8
Author: Campbell Barton
Date: Mon May 19 17:12:14 2014 +1000
https://developer.blender.org/rBdd1fc26000af7f06b4a0eb0e9629eaccaa6adae8
stub out binreloc
===================================================================
M source/tests/blenlib_tests/CMakeLists.txt
M source/tests/blenlib_tests/path_util_test.cc
===================================================================
diff --git a/source/tests/blenlib_tests/CMakeLists.txt b/source/tests/blenlib_tests/CMakeLists.txt
index 1db767e..e2b226b 100644
--- a/source/tests/blenlib_tests/CMakeLists.txt
+++ b/source/tests/blenlib_tests/CMakeLists.txt
@@ -31,4 +31,4 @@ include_directories(${INC})
BLENDER_TEST(mathutils_color "bf_blenlib")
BLENDER_TEST(mathutils_geom "bf_blenlib")
-BLENDER_TEST(path_util "bf_blenlib;extern_wcwidth;extern_binreloc;${ZLIB_LIBRARIES}")
+BLENDER_TEST(path_util "bf_blenlib;extern_wcwidth;${ZLIB_LIBRARIES}")
diff --git a/source/tests/blenlib_tests/path_util_test.cc b/source/tests/blenlib_tests/path_util_test.cc
index 4c1100a..20ca373 100644
--- a/source/tests/blenlib_tests/path_util_test.cc
+++ b/source/tests/blenlib_tests/path_util_test.cc
@@ -13,6 +13,9 @@ extern "C" {
const char *GHOST_getUserDir(int version, const char *versionstr);
const char *GHOST_getSystemDir(int version, const char *versionstr);
+#ifdef __linux__
+char *zLhm65070058860608_br_find_exe(const char *default_exe);
+#endif
const char *GHOST_getUserDir(int version, const char *versionstr)
{
@@ -27,6 +30,13 @@ const char *GHOST_getSystemDir(int version, const char *versionstr)
struct ImBuf;
void IMB_freeImBuf(struct ImBuf *ibuf) {}
+#ifdef __linux__
+char *zLhm65070058860608_br_find_exe(const char *default_exe)
+{
+ return NULL;
+}
+#endif
+
}
More information about the Bf-blender-cvs
mailing list