vbox的更動 66170 路徑 trunk/src/VBox/HostServices

時間撮記:

2017-3-20 下午02:35:00 (8 年 以前)

作者:

vboxsync

訊息:

bugref:8019: Undefined behaviour sanitiser: disable the leak check when running the VBoxOGLTest tool, as it contains known memory leaks which make the sanitiser report failure.

位置:

trunk/src/VBox/HostServices/SharedOpenGL

檔案:

• Makefile.kmk (修改) (1 筆差異)
• OpenGLTest/OpenGLTest.cpp (修改) (2 筆差異)

trunk/src/VBox/HostServices/SharedOpenGL/Makefile.kmk

@@ -408 +408 @@
 ifneq ($(KBUILD_TARGET),darwin)
   VBoxOGLTest_SOURCES = OpenGLTest/OpenGLTest.cpp
+ ifneq ($(KBUILD_TARGET),win)
+  VBoxOGLTest_DEFS += $(if $(VBOX_WITH_GCC_SANITIZER),VBOX_WITH_GCC_SANITIZER,)
+ endif
 endif
 VBoxOGLTest_SOURCES.darwin = OpenGLTest/OpenGLTestDarwin.cpp

trunk/src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTest.cpp

@@ -45 +45 @@
     uint64_t StartTS;
 
+#ifdef VBOX_WITH_GCC_SANITIZER
+    /* The OpenGL test tool contains a number of memory leaks which cause it to
+     * return failure when run with ASAN unless we disable the leak detector. */
+    RTENV env;
+    if (RT_FAILURE(RTEnvClone(&env, RTENV_DEFAULT)))
+        return false;
+    RTEnvPutEx(env, "ASAN_OPTIONS=detect_leaks=0");  /* If this fails we will notice later */
+#endif
     rc = RTPathExecDir(pszVBoxPath, RTPATH_MAX); AssertRCReturn(rc, false);
 #if defined(RT_OS_WINDOWS) || defined(RT_OS_OS2)
@@ -54 +62 @@
     AssertRCReturn(rc, false);
 
+#ifndef VBOX_WITH_GCC_SANITIZER
     rc = RTProcCreate(pszVBoxPath, papszArgs, RTENV_DEFAULT, 0, &Process);
+#else
+    rc = RTProcCreate(pszVBoxPath, papszArgs, env, 0, &Process);
+    RTEnvDestroy(env);
+#endif
     if (RT_FAILURE(rc))
         return false;