Backout changeset b75337bbcf6b (bug 677864) because of xpcshell test failure
authorEhsan Akhgari <ehsan@mozilla.com>
Wed, 17 Aug 2011 17:11:23 -0400
changeset 75435 2c5ef30a89b26fc38d88c0848c391e68db8756dd
parent 75434 de9252e8b8f46d84a84d7c89892d5d98252983bd
child 75436 800f7541fb20db6cecf427c9342fde4efdb8abe4
push id21023
push usermak77@bonardo.net
push dateThu, 18 Aug 2011 09:39:20 +0000
treeherdermozilla-central@f69a10f23bf3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs677864
milestone9.0a1
backs outb75337bbcf6bef9d887357e862a6c3fead406c0c
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backout changeset b75337bbcf6b (bug 677864) because of xpcshell test failure
js/src/xpconnect/src/xpccomponents.cpp
js/src/xpconnect/tests/unit/test_bug677864.js
js/src/xpconnect/tests/unit/xpcshell.ini
--- a/js/src/xpconnect/src/xpccomponents.cpp
+++ b/js/src/xpconnect/src/xpccomponents.cpp
@@ -498,17 +498,17 @@ nsXPCComponents_InterfacesByID::GetContr
     *aContractID = nsnull;
     return NS_ERROR_NOT_AVAILABLE;
 }
 
 /* readonly attribute string classDescription; */
 NS_IMETHODIMP
 nsXPCComponents_InterfacesByID::GetClassDescription(char * *aClassDescription)
 {
-    static const char classDescription[] = "XPCComponents_InterfacesByID";
+    static const char classDescription[] = "XPCComponents_Interfaces";
     *aClassDescription = (char*)nsMemory::Clone(classDescription, sizeof(classDescription));
     return *aClassDescription ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
 }
 
 /* readonly attribute nsCIDPtr classID; */
 NS_IMETHODIMP
 nsXPCComponents_InterfacesByID::GetClassID(nsCID * *aClassID)
 {
@@ -1070,17 +1070,17 @@ nsXPCComponents_ClassesByID::GetContract
     *aContractID = nsnull;
     return NS_ERROR_NOT_AVAILABLE;
 }
 
 /* readonly attribute string classDescription; */
 NS_IMETHODIMP 
 nsXPCComponents_ClassesByID::GetClassDescription(char * *aClassDescription)
 {
-    static const char classDescription[] = "XPCComponents_ClassesByID";
+    static const char classDescription[] = "XPCComponents_Interfaces";
     *aClassDescription = (char*)nsMemory::Clone(classDescription, sizeof(classDescription));
     return *aClassDescription ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
 }
 
 /* readonly attribute nsCIDPtr classID; */
 NS_IMETHODIMP 
 nsXPCComponents_ClassesByID::GetClassID(nsCID * *aClassID)
 {
@@ -1341,17 +1341,17 @@ nsXPCComponents_Results::GetContractID(c
     *aContractID = nsnull;
     return NS_ERROR_NOT_AVAILABLE;
 }
 
 /* readonly attribute string classDescription; */
 NS_IMETHODIMP 
 nsXPCComponents_Results::GetClassDescription(char * *aClassDescription)
 {
-    static const char classDescription[] = "XPCComponents_Results";
+    static const char classDescription[] = "XPCComponents_Interfaces";
     *aClassDescription = (char*)nsMemory::Clone(classDescription, sizeof(classDescription));
     return *aClassDescription ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
 }
 
 /* readonly attribute nsCIDPtr classID; */
 NS_IMETHODIMP 
 nsXPCComponents_Results::GetClassID(nsCID * *aClassID)
 {
@@ -1570,17 +1570,17 @@ nsXPCComponents_ID::GetContractID(char *
     *aContractID = nsnull;
     return NS_ERROR_NOT_AVAILABLE;
 }
 
 /* readonly attribute string classDescription; */
 NS_IMETHODIMP 
 nsXPCComponents_ID::GetClassDescription(char * *aClassDescription)
 {
-    static const char classDescription[] = "XPCComponents_ID";
+    static const char classDescription[] = "XPCComponents_Interfaces";
     *aClassDescription = (char*)nsMemory::Clone(classDescription, sizeof(classDescription));
     return *aClassDescription ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
 }
 
 /* readonly attribute nsCIDPtr classID; */
 NS_IMETHODIMP 
 nsXPCComponents_ID::GetClassID(nsCID * *aClassID)
 {
@@ -1798,17 +1798,17 @@ nsXPCComponents_Exception::GetContractID
     *aContractID = nsnull;
     return NS_ERROR_NOT_AVAILABLE;
 }
 
 /* readonly attribute string classDescription; */
 NS_IMETHODIMP 
 nsXPCComponents_Exception::GetClassDescription(char * *aClassDescription)
 {
-    static const char classDescription[] = "XPCComponents_Exception";
+    static const char classDescription[] = "XPCComponents_Interfaces";
     *aClassDescription = (char*)nsMemory::Clone(classDescription, sizeof(classDescription));
     return *aClassDescription ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
 }
 
 /* readonly attribute nsCIDPtr classID; */
 NS_IMETHODIMP 
 nsXPCComponents_Exception::GetClassID(nsCID * *aClassID)
 {
@@ -2093,17 +2093,17 @@ nsXPCConstructor::GetContractID(char * *
     *aContractID = nsnull;
     return NS_ERROR_NOT_AVAILABLE;
 }
 
 /* readonly attribute string classDescription; */
 NS_IMETHODIMP 
 nsXPCConstructor::GetClassDescription(char * *aClassDescription)
 {
-    static const char classDescription[] = "XPCConstructor";
+    static const char classDescription[] = "XPCComponents_Interfaces";
     *aClassDescription = (char*)nsMemory::Clone(classDescription, sizeof(classDescription));
     return *aClassDescription ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
 }
 
 /* readonly attribute nsCIDPtr classID; */
 NS_IMETHODIMP 
 nsXPCConstructor::GetClassID(nsCID * *aClassID)
 {
@@ -2359,17 +2359,17 @@ nsXPCComponents_Constructor::GetContract
     *aContractID = nsnull;
     return NS_ERROR_NOT_AVAILABLE;
 }
 
 /* readonly attribute string classDescription; */
 NS_IMETHODIMP 
 nsXPCComponents_Constructor::GetClassDescription(char * *aClassDescription)
 {
-    static const char classDescription[] = "XPCComponents_Constructor";
+    static const char classDescription[] = "XPCComponents_Interfaces";
     *aClassDescription = (char*)nsMemory::Clone(classDescription, sizeof(classDescription));
     return *aClassDescription ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
 }
 
 /* readonly attribute nsCIDPtr classID; */
 NS_IMETHODIMP 
 nsXPCComponents_Constructor::GetClassID(nsCID * *aClassID)
 {
deleted file mode 100644
--- a/js/src/xpconnect/tests/unit/test_bug677864.js
+++ /dev/null
@@ -1,15 +0,0 @@
-function check_cl(iface, desc) {
-    do_check_eq(iface.QueryInterface(Components.interfaces.nsIClassInfo).classDescription, desc);
-}
-
-function run_test() {
-    check_cl(Components, 'XPCComponents');
-    check_cl(Components.interfaces, 'XPCComponents_Interfaces');
-    check_cl(Components.interfacesByID, 'XPCComponents_InterfacesByID');
-    check_cl(Components.classes, 'XPCComponents_Classes');
-    check_cl(Components.classesByID, 'XPCComponents_ClassesByID');
-    check_cl(Components.results, 'XPCComponents_Results');
-    check_cl(Components.ID, 'XPCComponents_ID');
-    check_cl(Components.Exception, 'XPCComponents_Exception');
-    check_cl(Components.Constructor, 'XPCComponents_Constructor');
-}
--- a/js/src/xpconnect/tests/unit/xpcshell.ini
+++ b/js/src/xpconnect/tests/unit/xpcshell.ini
@@ -4,17 +4,16 @@ tail =
 
 [test_bogus_files.js]
 [test_bug408412.js]
 [test_bug451678.js]
 [test_bug596580.js]
 [test_bug604362.js]
 [test_bug608142.js]
 [test_bug641378.js]
-[test_bug677864.js]
 [test_bug_442086.js]
 [test_file.js]
 [test_import.js]
 [test_js_weak_references.js]
 [test_localeCompare.js]
 [test_recursive_import.js]
 [test_xpcomutils.js]
 [test_unload.js]