From 103ed7a5b09b6d3bc6e9c43a6a7bed9058100c03 Mon Sep 17 00:00:00 2001 From: Nathan Froyd Date: Thu, 7 Aug 2014 14:46:15 -0400 Subject: [PATCH] Bug 1050433 - part 1 - move effective_tld_names.dat into xpcshell manifest declarations; r=mshal --- netwerk/test/Makefile.in | 7 ------- netwerk/test/unit/xpcshell.ini | 1 + 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/netwerk/test/Makefile.in b/netwerk/test/Makefile.in index 33e070cde73..e5d5dc53565 100644 --- a/netwerk/test/Makefile.in +++ b/netwerk/test/Makefile.in @@ -7,10 +7,3 @@ DEFINES += $(TK_CFLAGS) include $(topsrcdir)/config/rules.mk - -# One of the xpcshell unit tests needs this file, so make sure it winds -# up in the test directory. -libs:: - $(NSINSTALL) -D $(DEPTH)/_tests/xpcshell/$(relativesrcdir)/unit/data - $(INSTALL) $(topsrcdir)/netwerk/dns/effective_tld_names.dat \ - $(DEPTH)/_tests/xpcshell/$(relativesrcdir)/unit/ diff --git a/netwerk/test/unit/xpcshell.ini b/netwerk/test/unit/xpcshell.ini index 6c7b3be1262..a0e8f5e74a1 100644 --- a/netwerk/test/unit/xpcshell.ini +++ b/netwerk/test/unit/xpcshell.ini @@ -17,6 +17,7 @@ support-files = socks_client_subprocess.js test_link.desktop test_link.url + ../../dns/effective_tld_names.dat [test_nsIBufferedOutputStream_writeFrom_block.js] [test_cache2-00-service-get.js]