# HG changeset patch
# User t_mrc-ct@users.sourceforge.jp
# Date 1409756070 -32400
# Branch GECKO3111_2014090813_RELBRANCH
# Node ID bcb90614db5663eae9e0cea7e0bf1b535acec8d0
# Parent  4bed24d91fa597aca093b8582868358ea77ceb7c
skip tests using test_plugin Part 2

diff --git a/dom/plugins/test/unit/xpcshell.ini b/dom/plugins/test/unit/xpcshell.ini
--- a/dom/plugins/test/unit/xpcshell.ini
+++ b/dom/plugins/test/unit/xpcshell.ini
@@ -1,20 +1,32 @@
 [DEFAULT]
 head = head_plugins.js
 tail = 
 
 [test_bug455213.js]
 # Bug 676953: test fails consistently on Android
-fail-if = os == "android"
+# TenFourFox does not support plug-in
+fail-if = os == "android" || (os == "mac" && processor == "powerpc")
 [test_bug471245.js]
 # Bug 676953: test fails consistently on Android
-fail-if = os == "android"
+# TenFourFox does not support plug-in
+fail-if = os == "android" || (os == "mac" && processor == "powerpc")
 [test_bug813245.js]
 # Bug 676953: test fails consistently on Android
-fail-if = os == "android"
+# TenFourFox does not support plug-in
+fail-if = os == "android" || (os == "mac" && processor == "powerpc")
 [test_nice_plugin_name.js]
 # Bug 676953: test fails consistently on Android
-fail-if = os == "android"
+# TenFourFox does not support plug-in
+fail-if = os == "android" || (os == "mac" && processor == "powerpc")
 [test_persist_in_prefs.js]
+# TenFourFox does not support plug-in
+skip-if = (os == "mac" && processor == "powerpc")
 [test_bug854467.js]
+# TenFourFox does not support plug-in
+skip-if = (os == "mac" && processor == "powerpc")
 [test_plugin_default_state.js]
+# TenFourFox does not support plug-in
+skip-if = (os == "mac" && processor == "powerpc")
 [test_plugin_default_state_xpi.js]
+# TenFourFox does not support plug-in
+skip-if = (os == "mac" && processor == "powerpc")
diff --git a/toolkit/mozapps/extensions/test/xpcshell/xpcshell-shared.ini b/toolkit/mozapps/extensions/test/xpcshell/xpcshell-shared.ini
--- a/toolkit/mozapps/extensions/test/xpcshell/xpcshell-shared.ini
+++ b/toolkit/mozapps/extensions/test/xpcshell/xpcshell-shared.ini
@@ -99,17 +99,18 @@
 [test_bug470377_4.js]
 # Bug 676992: test consistently hangs on Android
 skip-if = os == "android"
 [test_bug514327_1.js]
 # Bug 676992: test consistently hangs on Android
 skip-if = os == "android"
 [test_bug514327_2.js]
 # Bug 676992: test consistently hangs on Android
-skip-if = os == "android"
+# TenFourFox does not support plug-in
+skip-if = os == "android" || (os == "mac" && processor == "powerpc")
 [test_bug514327_3.js]
 # Bug 676992: test consistently hangs on Android
 skip-if = os == "android"
 [test_bug521905.js]
 [test_bug526598.js]
 [test_bug541420.js]
 [test_bug542391.js]
 run-sequentially = Uses hardcoded ports in xpi files.
@@ -183,17 +184,17 @@
 [test_gfxBlacklist_OSVersion_match.js]
 [test_gfxBlacklist_OSVersion_mismatch_OSVersion.js]
 [test_gfxBlacklist_OSVersion_mismatch_DriverVersion.js]
 [test_gfxBlacklist_Vendor.js]
 [test_gfxBlacklist_prefs.js]
 [test_hasbinarycomponents.js]
 [test_hotfix.js]
 # TFFx Issue 123: test consistently hangs on PPC Mac
-skip-if = os == 'mac' && processor == 'powerpc'
+skip-if = (os == "mac" && processor == "powerpc")
 [test_install.js]
 [test_install_icons.js]
 # Bug 676992: test consistently hangs on Android
 skip-if = os == "android"
 [test_install_strictcompat.js]
 # Bug 676992: test consistently hangs on Android
 skip-if = os == "android"
 run-sequentially = Uses hardcoded ports in xpi files.
@@ -213,16 +214,18 @@
 [test_migrate5.js]
 [test_migrateAddonRepository.js]
 [test_migrate_max_version.js]
 [test_no_addons.js]
 [test_onPropertyChanged_appDisabled.js]
 [test_permissions.js]
 [test_permissions_prefs.js]
 [test_plugins.js]
+# TenFourFox does not support plug-in
+skip-if = (os == "mac" && processor == "powerpc")
 [test_pluginchange.js]
 [test_pluginBlocklistCtp.js]
 # Bug 676992: test consistently fails on Android
 fail-if = os == "android"
 [test_pref_properties.js]
 [test_registry.js]
 [test_safemode.js]
 [test_shutdown.js]
