Unify intl/locale xpcshell tests in one directory. Bug 668515, r=ted

--HG--
rename : intl/locale/tests_multilocale/unit/test_bug22310.js => intl/locale/tests/unit/test_bug22310.js
rename : intl/locale/src/unix/tests/unit/test_bug374040.js => intl/locale/tests/unit/test_bug374040.js

intl/locale/Makefile.in

@@ -49,9 +49,6 @@ DIRS		= public idl src
 
 ifdef ENABLE_TESTS
 DIRS		+= tests
-ifneq (,$(filter cocoa windows, $(MOZ_WIDGET_TOOLKIT)))
-DIRS		+= tests_multilocale
-endif
 endif
 
 include $(topsrcdir)/config/rules.mk

intl/locale/src/unix/Makefile.in

@@ -60,10 +60,6 @@ else
 CPPSRCS		+= nsUNIXCharset.cpp
 endif
 
-ifdef ENABLE_TESTS
-DIRS		+= tests
-endif
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= -I$(srcdir)/..

intl/locale/src/unix/tests/Makefile.in

@@ -1,49 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of the GNU General Public License Version 2 or later (the "GPL"),
-# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir = intl/locale/src/unix/tests
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE          = test_intl_locale_unix
-XPCSHELL_TESTS  = unit
-
-include $(topsrcdir)/config/rules.mk

intl/locale/src/unix/tests/unit/xpcshell.ini

@@ -1,5 +0,0 @@
-[DEFAULT]
-head = 
-tail = 
-
-[test_bug374040.js]

intl/locale/tests/unit/xpcshell.ini

@@ -2,7 +2,13 @@
 head = 
 tail = 
 
+[test_bug22310.js]
+run-if = toolkit == "windows" || toolkit == "cocoa"
+
 [test_bug371611.js]
+[test_bug374040.js]
+skip-if = toolkit == "windows" || toolkit == "cocoa" || toolkit == "os2"
+
 [test_pluralForm.js]
 [test_pluralForm_english.js]
 [test_pluralForm_makeGetter.js]

intl/locale/tests_multilocale/Makefile.in

@@ -1,49 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of the GNU General Public License Version 2 or later (the "GPL"),
-# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir = intl/locale/tests_multilocale
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE          = test_intl_locale_multilocale
-XPCSHELL_TESTS  = unit
-
-include $(topsrcdir)/config/rules.mk

intl/locale/tests_multilocale/unit/xpcshell.ini

@@ -1,5 +0,0 @@
-[DEFAULT]
-head = 
-tail = 
-
-[test_bug22310.js]

testing/xpcshell/xpcshell.ini

@@ -71,9 +71,6 @@
 [include:layout/tools/layout-debug/tests/unit/xpcshell.ini]
 skip-if = !debug
 
-[include:intl/locale/tests_multilocale/unit/xpcshell.ini]
-run-if = toolkit == "windows" || toolkit == "cocoa"
-
 [include:toolkit/crashreporter/test/unit/xpcshell.ini]
 skip-if = os == "linux" || !crashreporter
 
@@ -81,9 +78,6 @@ skip-if = os == "linux" || !crashreporter
 [include:toolkit/crashreporter/client/maemo-unit/xpcshell.ini]
 run-if = os == "maemo"
 
-[include:intl/locale/src/unix/tests/unit/xpcshell.ini]
-skip-if = toolkit == "windows" || toolkit == "cocoa" || toolkit == "os2"
-
 [include:toolkit/components/commandlines/test/unit_win/xpcshell.ini]
 skip-if = os != "win"