From 6a523f9e876c7b462b592107dd054002b1ce897f Mon Sep 17 00:00:00 2001 From: Justin Lebar Date: Wed, 28 Mar 2012 11:36:03 -0700 Subject: [PATCH] Bug 736688 - Part 2: Move browser frame tests to their own directory. r=smaug --HG-- extra : rebase_source : b8c03a5cc74b528fce8b4bb7ff77f9a25ab85800 --- dom/tests/mochitest/Makefile.in | 1 + dom/tests/mochitest/browser-frame/Makefile.in | 59 +++++++++++++++++++ .../browserFrameHelpers.js | 0 .../test_browserFrame1.html | 0 .../test_browserFrame2.html | 0 .../test_browserFrame3.html | 0 .../test_browserFrame4.html | 0 .../test_browserFrame5.html | 2 +- .../test_browserFrame6.html | 1 - .../test_browserFrame7.html | 0 dom/tests/mochitest/general/Makefile.in | 8 --- 11 files changed, 61 insertions(+), 10 deletions(-) create mode 100644 dom/tests/mochitest/browser-frame/Makefile.in rename dom/tests/mochitest/{general => browser-frame}/browserFrameHelpers.js (100%) rename dom/tests/mochitest/{general => browser-frame}/test_browserFrame1.html (100%) rename dom/tests/mochitest/{general => browser-frame}/test_browserFrame2.html (100%) rename dom/tests/mochitest/{general => browser-frame}/test_browserFrame3.html (100%) rename dom/tests/mochitest/{general => browser-frame}/test_browserFrame4.html (100%) rename dom/tests/mochitest/{general => browser-frame}/test_browserFrame5.html (99%) rename dom/tests/mochitest/{general => browser-frame}/test_browserFrame6.html (99%) rename dom/tests/mochitest/{general => browser-frame}/test_browserFrame7.html (100%) diff --git a/dom/tests/mochitest/Makefile.in b/dom/tests/mochitest/Makefile.in index 91bfa784905..8dfae2fc583 100644 --- a/dom/tests/mochitest/Makefile.in +++ b/dom/tests/mochitest/Makefile.in @@ -57,6 +57,7 @@ DIRS += \ orientation \ sessionstorage \ storageevent \ + browser-frame \ $(NULL) #needs IPC support, also tests do not run successfully in Firefox for now diff --git a/dom/tests/mochitest/browser-frame/Makefile.in b/dom/tests/mochitest/browser-frame/Makefile.in new file mode 100644 index 00000000000..4c01fc41ee0 --- /dev/null +++ b/dom/tests/mochitest/browser-frame/Makefile.in @@ -0,0 +1,59 @@ +# +# ***** 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 +# Mozilla Foundation. +# Portions created by the Initial Developer are Copyright (C) 2007 +# 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 = dom/tests/mochitest/browser-frame + +include $(DEPTH)/config/autoconf.mk +include $(topsrcdir)/config/rules.mk + +_TEST_FILES = \ + browserFrameHelpers.js \ + test_browserFrame1.html \ + test_browserFrame2.html \ + test_browserFrame3.html \ + test_browserFrame4.html \ + test_browserFrame5.html \ + test_browserFrame6.html \ + test_browserFrame7.html \ + $(NULL) + +libs:: $(_TEST_FILES) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/dom/tests/mochitest/general/browserFrameHelpers.js b/dom/tests/mochitest/browser-frame/browserFrameHelpers.js similarity index 100% rename from dom/tests/mochitest/general/browserFrameHelpers.js rename to dom/tests/mochitest/browser-frame/browserFrameHelpers.js diff --git a/dom/tests/mochitest/general/test_browserFrame1.html b/dom/tests/mochitest/browser-frame/test_browserFrame1.html similarity index 100% rename from dom/tests/mochitest/general/test_browserFrame1.html rename to dom/tests/mochitest/browser-frame/test_browserFrame1.html diff --git a/dom/tests/mochitest/general/test_browserFrame2.html b/dom/tests/mochitest/browser-frame/test_browserFrame2.html similarity index 100% rename from dom/tests/mochitest/general/test_browserFrame2.html rename to dom/tests/mochitest/browser-frame/test_browserFrame2.html diff --git a/dom/tests/mochitest/general/test_browserFrame3.html b/dom/tests/mochitest/browser-frame/test_browserFrame3.html similarity index 100% rename from dom/tests/mochitest/general/test_browserFrame3.html rename to dom/tests/mochitest/browser-frame/test_browserFrame3.html diff --git a/dom/tests/mochitest/general/test_browserFrame4.html b/dom/tests/mochitest/browser-frame/test_browserFrame4.html similarity index 100% rename from dom/tests/mochitest/general/test_browserFrame4.html rename to dom/tests/mochitest/browser-frame/test_browserFrame4.html diff --git a/dom/tests/mochitest/general/test_browserFrame5.html b/dom/tests/mochitest/browser-frame/test_browserFrame5.html similarity index 99% rename from dom/tests/mochitest/general/test_browserFrame5.html rename to dom/tests/mochitest/browser-frame/test_browserFrame5.html index 742340394da..616eef05dba 100644 --- a/dom/tests/mochitest/general/test_browserFrame5.html +++ b/dom/tests/mochitest/browser-frame/test_browserFrame5.html @@ -34,7 +34,7 @@ function runTest() { iframe1.src = 'http://example.org'; document.body.appendChild(iframe1); } - + function runTest2() { var iframe1 = document.getElementById('iframe1'); var iframe2 = document.getElementById('iframe2'); diff --git a/dom/tests/mochitest/general/test_browserFrame6.html b/dom/tests/mochitest/browser-frame/test_browserFrame6.html similarity index 99% rename from dom/tests/mochitest/general/test_browserFrame6.html rename to dom/tests/mochitest/browser-frame/test_browserFrame6.html index 91627e4cf94..16c1959e4fa 100644 --- a/dom/tests/mochitest/general/test_browserFrame6.html +++ b/dom/tests/mochitest/browser-frame/test_browserFrame6.html @@ -79,4 +79,3 @@ addEventListener('load', function() { SimpleTest.executeSoon(runTest); }); - diff --git a/dom/tests/mochitest/general/test_browserFrame7.html b/dom/tests/mochitest/browser-frame/test_browserFrame7.html similarity index 100% rename from dom/tests/mochitest/general/test_browserFrame7.html rename to dom/tests/mochitest/browser-frame/test_browserFrame7.html diff --git a/dom/tests/mochitest/general/Makefile.in b/dom/tests/mochitest/general/Makefile.in index 6892a88cd48..49da2fca060 100644 --- a/dom/tests/mochitest/general/Makefile.in +++ b/dom/tests/mochitest/general/Makefile.in @@ -72,14 +72,6 @@ _TEST_FILES = \ test_focusrings.xul \ file_moving_xhr.html \ test_vibrator.html \ - browserFrameHelpers.js \ - test_browserFrame1.html \ - test_browserFrame2.html \ - test_browserFrame3.html \ - test_browserFrame4.html \ - test_browserFrame5.html \ - test_browserFrame6.html \ - test_browserFrame7.html \ test_for_of.html \ test_focus_legend_noparent.html \ file_clonewrapper.html \