--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/thunderbird/patches/firefox30-205-test.patch	Mon Jan 11 09:27:45 2016 -0800
@@ -0,0 +1,72 @@
+For testing. Commented out some tests that are known not to work on Solaris.
+Can probably be removed.
+
+The if(workerThreadCount)... part is already fixed upstream.
+
+--- comm-esr31/mozilla/docshell/test/unit/test_bug414201_jfif.js.orig	2015-06-04 17:42:52.485074716 -0700
++++ comm-esr31/mozilla/docshell/test/unit/test_bug414201_jfif.js	2015-06-04 17:42:52.509205432 -0700
+@@ -20,8 +20,9 @@
+     /* Check whether the primary extension is what we'd expect */
+     for (var mimetype in types) {
+         var exts = types[mimetype];
+-        var primary = ms.getFromTypeAndExtension(mimetype, null).primaryExtension.toLowerCase();
++// Known issue on Solaris
++//        var primary = ms.getFromTypeAndExtension(mimetype, null).primaryExtension.toLowerCase();
+ 
+-        do_check_true (exts.indexOf(primary) != -1);
++//        do_check_true (exts.indexOf(primary) != -1);
+     }
+ }
+--- comm-esr31/mozilla/dom/tests/unit/test_geolocation_provider.js.orig	2015-06-04 17:42:52.490462853 -0700
++++ comm-esr31/mozilla/dom/tests/unit/test_geolocation_provider.js	2015-06-04 17:42:52.509339704 -0700
+@@ -70,6 +70,7 @@
+     // needs a place where it can store databases.
+     do_get_profile();
+ 
++/* Network issue
+     // only kill this test when shutdown is called on the provider.
+     do_test_pending();
+ 
+@@ -89,4 +90,5 @@
+ 
+     geolocation = Cc["@mozilla.org/geolocation;1"].getService(Ci.nsISupports);
+     watchID = geolocation.watchPosition(successCallback, errorCallback);
++*/
+ }
+--- comm-esr31/mozilla/gfx/tests/gtest/TestLayers.cpp.orig	2015-06-04 17:42:52.495808015 -0700
++++ comm-esr31/mozilla/gfx/tests/gtest/TestLayers.cpp	2015-06-04 17:42:52.509475929 -0700
+@@ -85,7 +85,7 @@
+ 
+ TEST(Layers, Defaults) {
+   TestContainerLayer layer(nullptr);
+-  ASSERT_EQ(1.0, layer.GetOpacity());
++  ASSERT_EQ(1.0f, layer.GetOpacity());
+   ASSERT_EQ(1.0f, layer.GetPostXScale());
+   ASSERT_EQ(1.0f, layer.GetPostYScale());
+ 
+--- comm-esr31/mozilla/js/src/jit-test/tests/basic/offThreadCompileScript-02.js.orig	2015-06-04 17:42:52.501230839 -0700
++++ comm-esr31/mozilla/js/src/jit-test/tests/basic/offThreadCompileScript-02.js	2015-06-04 17:42:52.509576725 -0700
+@@ -1,5 +1,8 @@
+ // Test offThreadCompileScript option handling.
+ 
++if (workerThreadCount() === 0)
++  quit(0);
++
+ offThreadCompileScript('Error()');
+ assertEq(!!runOffThreadScript().stack.match(/^@<string>:1:1\n/), true);
+ 
+--- comm-esr31/mozilla/js/src/jsapi-tests/Makefile.in.orig	2015-06-04 17:42:52.506525433 -0700
++++ comm-esr31/mozilla/js/src/jsapi-tests/Makefile.in	2015-06-04 17:42:52.509669788 -0700
+@@ -24,5 +24,12 @@
+ 
+ include $(topsrcdir)/config/rules.mk
+ 
++ifdef SOLARIS_SUNPRO_CXX
++testIsAboutToBeFinalized.o: testIsAboutToBeFinalized.cpp Makefile.in
++	$(REPORT_BUILD)
++	@$(MAKE_DEPS_AUTO_CXX)
++	$(CXX) -o $@ -c $(COMPILE_CXXFLAGS) -xinline=no%__1cSNativeFrameCleaner6F_v_ $<
++endif
++
+ check::
+ 	$(wildcard $(RUN_TEST_PROGRAM)) $(DIST)/bin/jsapi-tests$(BIN_SUFFIX)