Bug 776985 - libs-xpcshell-tests should not attempt to install backup files that end in ~, r=ted
authorBenjamin Smedberg <benjamin@smedbergs.us>
Wed, 25 Jul 2012 10:26:41 -0400
changeset 125050 ff6a7246cb9ec423dd159ca1126f555559b6bccd
parent 125049 29e9bc98ea775ffac363b77370f115184ad69d4b
child 125051 acb351f0c50ad65b070954d0535fb2ee6f32f486
push id2151
push userlsblakk@mozilla.com
push dateTue, 19 Feb 2013 18:06:57 +0000
treeherdermozilla-beta@4952e88741ec [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs776985
milestone20.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 776985 - libs-xpcshell-tests should not attempt to install backup files that end in ~, r=ted
config/makefiles/xpcshell.mk
js/src/config/makefiles/xpcshell.mk
--- a/config/makefiles/xpcshell.mk
+++ b/config/makefiles/xpcshell.mk
@@ -10,17 +10,17 @@ ifndef INCLUDED_TESTS_XPCSHELL_MK #{
 
 ifdef XPCSHELL_TESTS #{
 
 ifndef relativesrcdir
 $(error Must define relativesrcdir when defining XPCSHELL_TESTS.)
 endif
 
 define _INSTALL_TESTS
-$(call install_cmd, $(wildcard $(srcdir)/$(dir)/*) $(testxpcobjdir)/$(relativesrcdir)/$(dir))
+$(call install_cmd, $(filter-out %~,$(wildcard $(srcdir)/$(dir)/*)) $(testxpcobjdir)/$(relativesrcdir)/$(dir))
 
 endef # do not remove the blank line!
 
 SOLO_FILE ?= $(error Specify a test filename in SOLO_FILE when using check-interactive or check-one)
 
 testxpcsrcdir = $(topsrcdir)/testing/xpcshell
 
 libs:: libs-xpcshell-tests
--- a/js/src/config/makefiles/xpcshell.mk
+++ b/js/src/config/makefiles/xpcshell.mk
@@ -10,17 +10,17 @@ ifndef INCLUDED_TESTS_XPCSHELL_MK #{
 
 ifdef XPCSHELL_TESTS #{
 
 ifndef relativesrcdir
 $(error Must define relativesrcdir when defining XPCSHELL_TESTS.)
 endif
 
 define _INSTALL_TESTS
-$(call install_cmd, $(wildcard $(srcdir)/$(dir)/*) $(testxpcobjdir)/$(relativesrcdir)/$(dir))
+$(call install_cmd, $(filter-out %~,$(wildcard $(srcdir)/$(dir)/*)) $(testxpcobjdir)/$(relativesrcdir)/$(dir))
 
 endef # do not remove the blank line!
 
 SOLO_FILE ?= $(error Specify a test filename in SOLO_FILE when using check-interactive or check-one)
 
 testxpcsrcdir = $(topsrcdir)/testing/xpcshell
 
 libs:: libs-xpcshell-tests