Backed out changeset a2017655dd34 (bug 1844484) for causing failures …

…in test_crash_purevirtual.js
dothq · Aug 1, 2023 · 72a3108 · 72a3108
1 parent 8ab5bba
commit 72a3108
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 51 deletions.
diff --git a/build/pure_virtual/moz.build b/build/pure_virtual/moz.build
diff --git a/build/pure_virtual/pure_virtual.c b/build/pure_virtual/pure_virtual.c
diff --git a/mfbt/moz.build b/mfbt/moz.build
@@ -205,8 +205,3 @@ if CONFIG["MOZ_NEEDS_LIBATOMIC"]:
     OS_LIBS += ["atomic"]
 
 DEFINES["LZ4LIB_VISIBILITY"] = ""
-
-# This is kind of gross because this is not a subdirectory,
-# but pure_virtual requires mfbt to build and some projects
-# don't use mfbt.
-DIRS += ["../build/pure_virtual"]
diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozbuild/frontend/emitter.py
@@ -388,8 +388,6 @@ def _link_libraries(self, context, obj, variable, extra_sources):
                     context, obj, variable, self.STDCXXCOMPAT_NAME[obj.KIND]
                 )
             if obj.KIND == "target":
-                if "pure_virtual" in self._libs:
-                    self._link_library(context, obj, variable, "pure_virtual")
                 for lib in context.config.substs.get("STLPORT_LIBS", []):
                     obj.link_system_library(lib)
 

diff --git a/toolkit/crashreporter/test/unit/test_crash_purevirtual.js b/toolkit/crashreporter/test/unit/test_crash_purevirtual.js
@@ -6,6 +6,14 @@ add_task(async function run_test() {
     return;
   }
 
+  var isOSX = "nsILocalFileMac" in Ci;
+  if (isOSX) {
+    dump(
+      "INFO | test_crash_purevirtual.js | TODO: purecalls not caught on OS X\n"
+    );
+    return;
+  }
+
   // Try crashing with a pure virtual call
   await do_crash(
     function () {