Commit bc43b824 authored by Ryan VanderMeulen's avatar Ryan VanderMeulen
Browse files

Merge m-c to inbound

parents f5eea634 6f999a8c

dom/plugins/test/mochitest/test_crash_submit.xul

+0 −7
Original line number Diff line number Diff line
@@ -93,12 +93,6 @@ function onPluginCrashed(aEvent) { 
}



function runTests() {

  if (navigator.userAgent.match(/ SeaMonkey\//)) {

    todo(false, "Skipping this test on Seamonkey ftb. (Bug 604129)");

    SimpleTest.finish();

    return;

  }



  if (!SimpleTest.testPluginIsOOP()) {

    todo(false, "Skipping this test when test plugin is not OOP.");

    SimpleTest.finish();
@@ -130,4 +124,3 @@ function runTests() { 
]]>

</script>

</window>

js/src/jsscript.cpp

+1 −1
Original line number Diff line number Diff line
@@ -981,7 +981,7 @@ js::SaveScriptFilename(JSContext *cx, const char *filename) 
     * scripts or exceptions pointing to the filename may no longer be

     * reachable.

     */

    if (cx->compartment->needsBarrier() && rt->gcIsFull)

    if (rt->gcIncrementalState == MARK && rt->gcIsFull)

        sfe->marked = true;

#endif

xpcom/tests/unit/xpcshell.ini

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ fail-if = os == "android" 
fail-if = os == "android"

[test_versioncomparator.js]

[test_comp_no_aslr.js]

fail-if = os != "win"

skip-if = os != "win"

[test_windows_shortcut.js]

[test_bug745466.js]

skip-if = os == "win"