Bug 1050433 - part 1 - move effective_tld_names.dat into xpcshell manifest declarations; r=mshal
authorNathan Froyd <froydnj@mozilla.com>
Thu, 07 Aug 2014 14:46:15 -0400
changeset 198895 d08e2ed52f0e48102d80ee2f0aa2f5476f2cc71a
parent 198894 f08f9f2a9a9e07e97d9f820f52e671a912f22f66
child 198896 f2a2559265feb50ea9b4e15489cfc205c220c5da
push id27290
push userryanvm@gmail.com
push dateMon, 11 Aug 2014 20:13:07 +0000
treeherdermozilla-central@97628c0d8bbe [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1050433
milestone34.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 1050433 - part 1 - move effective_tld_names.dat into xpcshell manifest declarations; r=mshal
netwerk/test/Makefile.in
netwerk/test/unit/xpcshell.ini
--- a/netwerk/test/Makefile.in
+++ b/netwerk/test/Makefile.in
@@ -2,15 +2,8 @@
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 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/
--- a/netwerk/test/unit/xpcshell.ini
+++ b/netwerk/test/unit/xpcshell.ini
@@ -12,16 +12,17 @@ support-files =
   data/test_readline5.txt
   data/test_readline6.txt
   data/test_readline7.txt
   data/test_readline8.txt
   data/signed_win.exe
   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]
 [test_cache2-01-basic.js]
 [test_cache2-01a-basic-readonly.js]
 [test_cache2-01b-basic-datasize.js]
 [test_cache2-01c-basic-hasmeta-only.js]
 [test_cache2-01d-basic-not-wanted.js]