Bug 660325 - Don't ship test jsms, r=bent
authorMichael Wu <mwu@mozilla.com>
Fri, 27 May 2011 13:13:29 -0700
changeset 70260 c6d349c58bd7da4db0cc5ab4cf5b15560d2a2599
parent 70259 a3b5d768fa9615c283ac5765c031fe55cbc2786f
child 70261 b8c7dd3bddbcf0604d990b66f9a09e48eea8816c
push idunknown
push userunknown
push dateunknown
reviewersbent
bugs660325
milestone7.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 660325 - Don't ship test jsms, r=bent
dom/src/threads/test/Makefile.in
dom/src/threads/test/test_chromeWorkerJSM.xul
--- a/dom/src/threads/test/Makefile.in
+++ b/dom/src/threads/test/Makefile.in
@@ -40,22 +40,16 @@ DEPTH            = ../../../..
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 relativesrcdir   = dom/src/threads/test
 
 include $(DEPTH)/config/autoconf.mk
 
-EXTRA_JS_MODULES = \
-  WorkerTest.jsm \
-  WorkerTest_worker.js \
-  WorkerTest_subworker.js \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
 _TEST_FILES = \
   test_404.html \
   test_atob.html \
   atob_worker.js \
   test_close.html \
   close_worker.js \
@@ -127,16 +121,19 @@ include $(topsrcdir)/config/rules.mk
   relativeLoad_sub_worker2.js \
   relativeLoad_sub_import.js \
   $(NULL)
 
 _CHROME_TEST_FILES = \
   test_chromeWorker.xul \
   test_chromeWorkerComponent.xul \
   test_chromeWorkerJSM.xul \
+  WorkerTest.jsm \
+  WorkerTest_worker.js \
+  WorkerTest_subworker.js \
   chromeWorker_worker.js \
   chromeWorker_subworker.js \
   $(NULL)
 
 libs:: $(_TEST_FILES)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
 
 libs:: $(_SUBDIR_TEST_FILES)
--- a/dom/src/threads/test/test_chromeWorkerJSM.xul
+++ b/dom/src/threads/test/test_chromeWorkerJSM.xul
@@ -67,17 +67,17 @@
         done();
       }
 
       function errorCallback(event) {
         ok(false, "Worker had an error: " + event.message);
         done();
       }
 
-      Components.utils.import("resource://gre/modules/WorkerTest.jsm");
+      Components.utils.import("chrome://mochitests/content/chrome/dom/src/threads/test/WorkerTest.jsm");
 
       worker = WorkerTest.go(window.location.href, messageCallback,
                              errorCallback);
     }
 
   ]]>
   </script>