diff --git a/testing/xpcshell/Makefile.in b/testing/xpcshell/Makefile.in index 0184a01d5b92..9fbb10bd3d5b 100644 --- a/testing/xpcshell/Makefile.in +++ b/testing/xpcshell/Makefile.in @@ -57,7 +57,6 @@ include $(topsrcdir)/config/rules.mk TEST_HARNESS_FILES := \ runxpcshelltests.py \ head.js \ - tail.js \ $(NULL) # Extra files needed from $(topsrcdir)/build diff --git a/testing/xpcshell/runxpcshelltests.py b/testing/xpcshell/runxpcshelltests.py index 45f51f7a93bd..87a390f41ac7 100644 --- a/testing/xpcshell/runxpcshelltests.py +++ b/testing/xpcshell/runxpcshelltests.py @@ -158,7 +158,6 @@ def runTests(xpcshell, testdirs=[], xrePath=None, testPath=None, 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|. @@ -214,7 +213,7 @@ def runTests(xpcshell, testdirs=[], xrePath=None, testPath=None, 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] diff --git a/testing/xpcshell/tail.js b/testing/xpcshell/tail.js deleted file mode 100644 index 1825e48da918..000000000000 --- 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 - * - * 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.)