bug 664197 - update xpcshell manifests with new conditions. r=jmaher

--HG--
extra : rebase_source : 21b5f1b5b34ec7a1efb2a8b444c9b41a6a39106d

testing/xpcshell/xpcshell.ini

@@ -69,51 +69,32 @@
 [include:toolkit/mozapps/shared/test/unit/xpcshell.ini]
 [include:services/crypto/component/tests/unit/xpcshell.ini]
 [include:layout/tools/layout-debug/tests/unit/xpcshell.ini]
-run-if.config = debug
+skip-if = !debug
 
 [include:intl/locale/tests_multilocale/unit/xpcshell.ini]
-run-if.toolkit = windows
-
-[include:intl/locale/tests_multilocale/unit/xpcshell.ini]
-run-if.toolkit = cocoa
+run-if = toolkit == "windows" || toolkit == "cocoa"
 
 [include:toolkit/crashreporter/test/unit/xpcshell.ini]
-skip-if.os = linux
-run-if.config = mozcrashreporter
+skip-if = os == "linux" || !crashreporter
 
+#XXX: we don't actually set os = maemo
 [include:toolkit/crashreporter/client/maemo-unit/xpcshell.ini]
-run-if.os = maemo
+run-if = os == "maemo"
 
 [include:intl/locale/src/unix/tests/unit/xpcshell.ini]
-skip-if.toolkit = windows cocoa os2
+skip-if = toolkit == "windows" || toolkit == "cocoa" || toolkit == "os2"
 
 [include:toolkit/components/commandlines/test/unit_win/xpcshell.ini]
-run-if.os = windows
+skip-if = os != "win"
 
 [include:toolkit/components/commandlines/test/unit_unix/xpcshell.ini]
-skip-if.os = windows mac os2
+skip-if = os == "win" || os == "mac" || os == "os2"
 
 [include:chrome/test/unit_ipc/xpcshell.ini]
-run-if.config = ipc
-
 [include:extensions/cookie/test/unit_ipc/xpcshell.ini]
-run-if.config = ipc
-
 [include:ipc/testshell/tests/xpcshell.ini]
-run-if.config = ipc
-
 [include:modules/libpref/test/unit_ipc/xpcshell.ini]
-run-if.config = ipc
-
 [include:netwerk/test/unit_ipc/xpcshell.ini]
-run-if.config = ipc
-
 [include:netwerk/cookie/test/unit_ipc/xpcshell.ini]
-run-if.config = ipc
-
 [include:toolkit/components/contentprefs/tests/unit_ipc/xpcshell.ini]
-run-if.config = ipc
-
 [include:uriloader/exthandler/tests/unit_ipc/xpcshell.ini]
-run-if.config = ipc
-