Changeset 86420 in vbox for trunk

Timestamp:

Oct 2, 2020 12:28:00 PM (4 years ago)

Author:

vboxsync

Message:

xpcom/TestObserverService: Two asan fixes. Made the testcase exit with non-zero value on failure. bugref:9841

File:

• trunk/src/libs/xpcom18a4/xpcom/tests/TestObserverService.cpp (modified) (10 diffs)

trunk/src/libs/xpcom18a4/xpcom/tests/TestObserverService.cpp

@@ -49 +49 @@
 static nsIObserverService *anObserverService = NULL;
 
+#ifdef VBOX
+static bool testResult( nsresult rv ) {
+    if ( NS_SUCCEEDED( rv ) ) {
+        printf("...ok\n");
+        return true;
+    }
+    printf("...failed, rv=0x%x\n", (int)rv);
+    return false;
+}
+#else
 static void testResult( nsresult rv ) {
     if ( NS_SUCCEEDED( rv ) ) {
@@ -57 +67 @@
     return;
 }
+#endif
 
 void printString(nsString &str) {
+#ifdef VBOX  /* asan complains about mixing different allocators */
+    char *cstr = ToNewCString(str);
+    printf("%s", cstr);
+    nsMemory::Free(cstr);
+#else
     const char *cstr = ToNewCString(str);
     printf("%s", cstr);
     delete [] (char*)cstr;
+#endif
 }
 
@@ -111 +128 @@
                                                  NS_GET_IID(nsIObserverService),
                                                 (void **) &anObserverService);
+#ifdef VBOX
+    bool fSuccess = res == NS_OK;
+#endif
         
     if (res == NS_OK) {
@@ -121 +141 @@
         printf("Adding Observer-A as observer of topic-A...\n");
         rv = anObserverService->AddObserver(aObserver, topicA.get(), PR_FALSE);
+#ifdef VBOX
+        fSuccess = fSuccess &&
+#endif
         testResult(rv);
  
         printf("Adding Observer-B as observer of topic-A...\n");
         rv = anObserverService->AddObserver(bObserver, topicA.get(), PR_FALSE);
+#ifdef VBOX
+        fSuccess = fSuccess &&
+#endif
         testResult(rv);
  
         printf("Adding Observer-B as observer of topic-B...\n");
         rv = anObserverService->AddObserver(bObserver, topicB.get(), PR_FALSE);
+#ifdef VBOX
+        fSuccess = fSuccess &&
+#endif
         testResult(rv);
 
@@ -135 +164 @@
                                    topicA.get(),
                                    NS_LITERAL_STRING("Testing Notify(observer-A, topic-A)").get() );
+#ifdef VBOX
+        fSuccess = fSuccess &&
+#endif
         testResult(rv);
 
@@ -141 +173 @@
                                    topicB.get(),
                                    NS_LITERAL_STRING("Testing Notify(observer-B, topic-B)").get() );
+#ifdef VBOX
+        fSuccess = fSuccess &&
+#endif
         testResult(rv);
  
@@ -147 +182 @@
         rv = anObserverService->EnumerateObservers(topicA.get(), getter_AddRefs(e));
 
+#ifdef VBOX
+        fSuccess = fSuccess &&
+#endif
         testResult(rv);
 
@@ -163 +201 @@
                                       topicA.get(), 
                                       NS_LITERAL_STRING("during enumeration").get() );
+#ifdef VBOX
+              fSuccess = fSuccess &&
+#endif
               testResult(rv);
           }
@@ -170 +211 @@
         printf("Removing Observer-A...\n");
         rv = anObserverService->RemoveObserver(aObserver, topicA.get());
+#ifdef VBOX
+        fSuccess = fSuccess &&
+#endif
         testResult(rv);
 
@@ -175 +219 @@
         printf("Removing Observer-B (topic-A)...\n");
         rv = anObserverService->RemoveObserver(bObserver, topicB.get());
+#ifdef VBOX
+        fSuccess = fSuccess &&
+#endif
         testResult(rv);
         printf("Removing Observer-B (topic-B)...\n");
         rv = anObserverService->RemoveObserver(bObserver, topicA.get());
-        testResult(rv);
-       
-    }
+#ifdef VBOX
+        fSuccess = fSuccess &&
+#endif
+        testResult(rv);
+
+#ifdef VBOX
+        /* Cleanup: */
+        nsrefcnt refs = bObserver->Release();
+        fSuccess = fSuccess && refs == 0;
+        if (refs != 0)
+            printf("bObserver->Release() -> %d, expected 0\n", (int)refs);
+
+        refs = aObserver->Release();
+        fSuccess = fSuccess && refs == 0;
+        if (refs != 0)
+            printf("aObserver->Release() -> %d, expected 0\n", (int)refs);
+#endif
+    }
+#ifdef VBOX
+    return fSuccess ? 0 : 1;
+#else
     return NS_OK;
-}
+#endif
+}