From 08573fa801efdd92590f65aa2a24b121a6c43189 Mon Sep 17 00:00:00 2001 From: "davel%mozilla.com" Date: Thu, 11 May 2006 21:29:44 +0000 Subject: [PATCH] b=337216, r=sayrer add target to makefile to invoke tests - replaced "ugly" shell script NPOTB git-svn-id: svn://10.0.0.236/trunk@196348 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/toolkit/components/feeds/Makefile.in | 8 +++- .../components/feeds/test/exectests.sh | 41 ------------------- 2 files changed, 7 insertions(+), 42 deletions(-) delete mode 100644 mozilla/toolkit/components/feeds/test/exectests.sh diff --git a/mozilla/toolkit/components/feeds/Makefile.in b/mozilla/toolkit/components/feeds/Makefile.in index f05b1e8cca0..123d9ed3913 100644 --- a/mozilla/toolkit/components/feeds/Makefile.in +++ b/mozilla/toolkit/components/feeds/Makefile.in @@ -41,4 +41,10 @@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk DIRS = public src -include $(topsrcdir)/config/rules.mk \ No newline at end of file +include $(topsrcdir)/config/rules.mk + +libs:: $(srcdir)/test/shell.js $(srcdir)/test/test.js $(srcdir)/test/xml + $(INSTALL) $^ $(DIST)/bin/feeds_tests + +check:: + cd $(DIST)/bin/feeds_tests; $(RUN_TEST_PROGRAM) $(DIST)/bin/xpcshell ./shell.js \ No newline at end of file diff --git a/mozilla/toolkit/components/feeds/test/exectests.sh b/mozilla/toolkit/components/feeds/test/exectests.sh deleted file mode 100644 index 4b2738b86fd..00000000000 --- a/mozilla/toolkit/components/feeds/test/exectests.sh +++ /dev/null @@ -1,41 +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 Feed Parser Unit Tests. -# -# The Initial Developer of the Original Code is Robert Sayre. -# -# Portions created by the Initial Developer are Copyright (C) 2005 -# the Initial Developer. All Rights Reserved. -# -# Contributor(s): -# -# 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 ***** - -export MOZILLA_FIVE_HOME=../../../../fb-debug/dist/bin -export LD_LIBRARY_PATH=../../../../fb-debug/dist/bin - -../../../../fb-debug/dist/bin/run-mozilla.sh ../../../../fb-debug/dist/bin/xpcshell ./shell.js -#perl ../../../../../js/src/xpconnect/tests/idispatch/Tests/jsDriver.pl -e xpcshell --shellpath=.. -k \ No newline at end of file