Bug 503613 - Stop using tail_ files in xpcshell: use do_register_cleanup() instead; (Av1a) Drop "empty" xpcshell tail.js; r=jwalden
authorSerge Gautherie <sgautherie.bz@free.fr>
Fri, 21 Aug 2009 00:51:17 +0200
changeset 31717 250248bebc425bc67f6957aefb13c0f377ae0d57
parent 31716 e73de77269d596b608b01f55c20c0e679143fd38
child 31718 5f0f97e166f79db9483a82ae78b549196b225d96
push idunknown
push userunknown
push dateunknown
reviewersjwalden
bugs503613
milestone1.9.3a1pre
Bug 503613 - Stop using tail_ files in xpcshell: use do_register_cleanup() instead; (Av1a) Drop "empty" xpcshell tail.js; r=jwalden
testing/xpcshell/Makefile.in
testing/xpcshell/runxpcshelltests.py
testing/xpcshell/tail.js
--- a/testing/xpcshell/Makefile.in
+++ b/testing/xpcshell/Makefile.in
@@ -52,17 +52,16 @@ DIRS  += example
 endif
 
 include $(topsrcdir)/config/rules.mk
 
 # Harness files from the srcdir
 TEST_HARNESS_FILES := \
   runxpcshelltests.py \
   head.js \
-  tail.js \
   $(NULL)
 
 # Extra files needed from $(topsrcdir)/build
 EXTRA_BUILD_FILES := \
   automationutils.py \
   $(NULL)
 
 # Components / typelibs that don't get packaged with
--- a/testing/xpcshell/runxpcshelltests.py
+++ b/testing/xpcshell/runxpcshelltests.py
@@ -153,17 +153,16 @@ def runTests(xpcshell, testdirs=[], xreP
     else:
       pStdout = PIPE
     pStderr = STDOUT
 
   # <head.js> has to be loaded by xpchell: it can't load itself.
   xpcsCmd = [xpcshell, '-g', xrePath, '-j', '-s'] + \
             ['-e', 'const _HTTPD_JS_PATH = "%s";' % httpdJSPath,
              '-f', os.path.join(testharnessdir, 'head.js')]
-  xpcsTailFile = [os.path.join(testharnessdir, 'tail.js')]
 
   # |testPath| will be the optional path only, or |None|.
   # |singleFile| will be the optional test only, or |None|.
   singleFile = None
   if testPath:
     if testPath.endswith('.js'):
       # Split into path and file.
       if testPath.find('/') == -1:
@@ -209,17 +208,17 @@ def runTests(xpcshell, testdirs=[], xreP
       if singleFile in [os.path.basename(x) for x in testfiles]:
         testfiles = [os.path.join(testdir, singleFile)]
       else: # not in this dir? skip it
         continue
 
     cmdH = ", ".join(['"' + f.replace('\\', '/') + '"'
                        for f in testHeadFiles])
     cmdT = ", ".join(['"' + f.replace('\\', '/') + '"'
-                       for f in (testTailFiles + xpcsTailFile)])
+                       for f in testTailFiles])
     cmdH = xpcsCmd + \
            ['-e', 'const _HEAD_FILES = [%s];' % cmdH] + \
            ['-e', 'const _TAIL_FILES = [%s];' % cmdT]
 
     # Now execute each test individually.
     for test in testfiles:
       # The test file will have to be loaded after the head files.
       cmdT = ['-e', 'const _TEST_FILE = ["%s"];' %
deleted file mode 100644
--- a/testing/xpcshell/tail.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:set ts=2 sw=2 sts=2 et: */
-/* ***** 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 Google Inc.
- * Portions created by the Initial Developer are Copyright (C) 2005
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *  Darin Fisher <darin@meer.net>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either 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 ***** */
-
-/*
- * This file contains common code that is loaded after each test file(s).
- * See http://developer.mozilla.org/en/docs/Writing_xpcshell-based_unit_tests
- * for more information.
- */
-
-// (Add code here.)