mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 446300 - move tools/test-harness/xpcshell-simple to testing/xpcshell; (Av1a-MC) Move the source harness directory; r=ted.mielczarek
--HG-- rename : tools/test-harness/xpcshell-simple/Makefile.in => testing/xpcshell/Makefile.in rename : tools/test-harness/xpcshell-simple/README => testing/xpcshell/README rename : tools/test-harness/xpcshell-simple/example/Makefile.in => testing/xpcshell/example/Makefile.in rename : tools/test-harness/xpcshell-simple/example/unit/test_sample.js => testing/xpcshell/example/unit/test_sample.js rename : tools/test-harness/xpcshell-simple/execute_test.js => testing/xpcshell/execute_test.js rename : tools/test-harness/xpcshell-simple/head.js => testing/xpcshell/head.js rename : tools/test-harness/xpcshell-simple/tail.js => testing/xpcshell/tail.js rename : tools/test-harness/xpcshell-simple/test_all.sh => testing/xpcshell/test_all.sh rename : tools/test-harness/xpcshell-simple/test_one.sh => testing/xpcshell/test_one.sh
This commit is contained in:
Serge Gautherie
parent
9bd933b858
commit
beb21941b4
@ -65,7 +65,7 @@ TIERS += testharness
|
||||
|
||||
# test harnesses
|
||||
ifdef ENABLE_TESTS
|
||||
tier_testharness_dirs += tools/test-harness
|
||||
tier_testharness_dirs += testing/xpcshell
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/config.mk
|
||||
|
||||
@ -153,12 +153,14 @@ NATIVE_TOPSRCDIR := $(topsrcdir)
|
||||
endif
|
||||
endif # CYGWIN_WRAPPER
|
||||
|
||||
testxpcdir = $(topsrcdir)/testing/xpcshell
|
||||
|
||||
# Test execution
|
||||
check::
|
||||
@$(EXIT_ON_ERROR) \
|
||||
for testdir in $(XPCSHELL_TESTS); do \
|
||||
$(RUN_TEST_PROGRAM) \
|
||||
$(topsrcdir)/tools/test-harness/xpcshell-simple/test_all.sh \
|
||||
$(testxpcdir)/test_all.sh \
|
||||
$(DIST)/bin/xpcshell \
|
||||
$(FWDSLASH_TOPSRCDIR) \
|
||||
$(NATIVE_TOPSRCDIR) \
|
||||
@ -169,7 +171,7 @@ check::
|
||||
check-interactive::
|
||||
@$(EXIT_ON_ERROR) \
|
||||
$(RUN_TEST_PROGRAM) \
|
||||
$(topsrcdir)/tools/test-harness/xpcshell-simple/test_one.sh \
|
||||
$(testxpcdir)/test_one.sh \
|
||||
$(DIST)/bin/xpcshell \
|
||||
$(FWDSLASH_TOPSRCDIR) \
|
||||
$(NATIVE_TOPSRCDIR) \
|
||||
@ -180,7 +182,7 @@ check-interactive::
|
||||
check-one::
|
||||
@$(EXIT_ON_ERROR) \
|
||||
$(RUN_TEST_PROGRAM) \
|
||||
$(topsrcdir)/tools/test-harness/xpcshell-simple/test_one.sh \
|
||||
$(testxpcdir)/test_one.sh \
|
||||
$(DIST)/bin/xpcshell \
|
||||
$(FWDSLASH_TOPSRCDIR) \
|
||||
$(NATIVE_TOPSRCDIR) \
|
||||
|
||||
@ -153,12 +153,14 @@ NATIVE_TOPSRCDIR := $(topsrcdir)
|
||||
endif
|
||||
endif # CYGWIN_WRAPPER
|
||||
|
||||
testxpcdir = $(topsrcdir)/testing/xpcshell
|
||||
|
||||
# Test execution
|
||||
check::
|
||||
@$(EXIT_ON_ERROR) \
|
||||
for testdir in $(XPCSHELL_TESTS); do \
|
||||
$(RUN_TEST_PROGRAM) \
|
||||
$(topsrcdir)/tools/test-harness/xpcshell-simple/test_all.sh \
|
||||
$(testxpcdir)/test_all.sh \
|
||||
$(DIST)/bin/xpcshell \
|
||||
$(FWDSLASH_TOPSRCDIR) \
|
||||
$(NATIVE_TOPSRCDIR) \
|
||||
@ -169,7 +171,7 @@ check::
|
||||
check-interactive::
|
||||
@$(EXIT_ON_ERROR) \
|
||||
$(RUN_TEST_PROGRAM) \
|
||||
$(topsrcdir)/tools/test-harness/xpcshell-simple/test_one.sh \
|
||||
$(testxpcdir)/test_one.sh \
|
||||
$(DIST)/bin/xpcshell \
|
||||
$(FWDSLASH_TOPSRCDIR) \
|
||||
$(NATIVE_TOPSRCDIR) \
|
||||
@ -180,7 +182,7 @@ check-interactive::
|
||||
check-one::
|
||||
@$(EXIT_ON_ERROR) \
|
||||
$(RUN_TEST_PROGRAM) \
|
||||
$(topsrcdir)/tools/test-harness/xpcshell-simple/test_one.sh \
|
||||
$(testxpcdir)/test_one.sh \
|
||||
$(DIST)/bin/xpcshell \
|
||||
$(FWDSLASH_TOPSRCDIR) \
|
||||
$(NATIVE_TOPSRCDIR) \
|
||||
|
||||
@ -36,14 +36,14 @@
|
||||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
DEPTH = ../../..
|
||||
DEPTH = ../..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = test_harness_xpcshell_simple
|
||||
MODULE = testing_xpcshell
|
||||
|
||||
# Here's how you let the build system know there are tests in the
|
||||
# "example" folder:
|
||||
@ -46,7 +46,7 @@
|
||||
#
|
||||
|
||||
# Note: DEPTH should be set to the relative path to mozilla/
|
||||
DEPTH = ../../../..
|
||||
DEPTH = ../../..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
@ -54,7 +54,7 @@ VPATH = @srcdir@
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
# Note: set the test module's name to test_<yourmodule>
|
||||
MODULE = test_harness_xpcshell_simple
|
||||
MODULE = test_testing_xpcshell_example
|
||||
|
||||
# This is a list of directories containing tests to run, separated by spaces.
|
||||
# Most likely, tho, you won't use more than one directory here.
|
||||
@ -69,7 +69,7 @@ topsrcdir="$2"
|
||||
# clean manner.
|
||||
native_topsrcdir="$3"
|
||||
|
||||
# The sample Makefile for the xpcshell-simple harness adds the directory where
|
||||
# The sample Makefile for the xpcshell harness adds the directory where
|
||||
# the test_*.js files reside as an arg. If no arg is specified, assume the
|
||||
# current directory is where the *.js files live.
|
||||
testdir="$4"
|
||||
@ -82,9 +82,11 @@ fi
|
||||
# SETUP FOR RUNNING THE TESTS #
|
||||
###############################
|
||||
|
||||
testxpcdir=$topsrcdir/testing/xpcshell
|
||||
|
||||
# files matching the pattern head_*.js are treated like test setup files
|
||||
# - they are run after head.js but before the test file
|
||||
headfiles="-f $topsrcdir/tools/test-harness/xpcshell-simple/head.js"
|
||||
headfiles="-f $testxpcdir/head.js"
|
||||
for h in $testdir/head_*.js
|
||||
do
|
||||
if [ -f $h ]; then
|
||||
@ -94,8 +96,8 @@ done
|
||||
|
||||
# files matching the pattern tail_*.js are treated like teardown files
|
||||
# - they are run after tail.js
|
||||
tailfiles="-f $topsrcdir/tools/test-harness/xpcshell-simple/tail.js"
|
||||
tailfiles="$tailfiles -f $topsrcdir/tools/test-harness/xpcshell-simple/execute_test.js"
|
||||
tailfiles="-f $testxpcdir/tail.js"
|
||||
tailfiles="$tailfiles -f $testxpcdir/execute_test.js"
|
||||
for t in $testdir/tail_*.js
|
||||
do
|
||||
if [ -f $t ]; then
|
||||
@ -76,7 +76,7 @@ topsrcdir="$2"
|
||||
# clean manner.
|
||||
native_topsrcdir="$3"
|
||||
|
||||
# The sample Makefile for the xpcshell-simple harness adds the directory where
|
||||
# The sample Makefile for the xpcshell harness adds the directory where
|
||||
# the test_*.js files reside as an arg. If no arg is specified, assume the
|
||||
# current directory is where the *.js files live.
|
||||
testdir="$4"
|
||||
@ -102,9 +102,11 @@ interactive_mode="$6"
|
||||
# SETUP FOR RUNNING THE TESTS #
|
||||
###############################
|
||||
|
||||
testxpcdir=$topsrcdir/testing/xpcshell
|
||||
|
||||
# files matching the pattern head_*.js are treated like test setup files
|
||||
# - they are run after head.js but before the test file
|
||||
headfiles="-f $topsrcdir/tools/test-harness/xpcshell-simple/head.js"
|
||||
headfiles="-f $testxpcdir/head.js"
|
||||
for h in $testdir/$target_dir/head_*.js
|
||||
do
|
||||
if [ -f $h ]; then
|
||||
@ -114,10 +116,10 @@ done
|
||||
|
||||
# files matching the pattern tail_*.js are treated like teardown files
|
||||
# - they are run after tail.js
|
||||
tailfiles="-f $topsrcdir/tools/test-harness/xpcshell-simple/tail.js"
|
||||
tailfiles="-f $testxpcdir/tail.js"
|
||||
|
||||
if [ ! "$interactive_mode" = "1" ]; then
|
||||
tailfiles="$tailfiles -f $topsrcdir/tools/test-harness/xpcshell-simple/execute_test.js"
|
||||
tailfiles="$tailfiles -f $testxpcdir/execute_test.js"
|
||||
fi
|
||||
|
||||
for t in $testdir/$target_dir/tail_*.js
|
||||
@ -1,50 +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):
|
||||
# David Liebreich <davel@mozilla.com> (Original author)
|
||||
#
|
||||
# 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@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = test_harness
|
||||
DIRS = xpcshell-simple
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
Loading…
Reference in New Issue
Block a user