1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
| | --- a/startupcache/test/Makefile.in
+++ a/startupcache/test/Makefile.in
@@ -1,10 +1,6 @@
#
# 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/.
LIBS += $(MOZ_COMPONENT_LIBS)
-DIST_FILES += \
- $(srcdir)/TestStartupCacheTelemetry.manifest \
- $(srcdir)/TestStartupCacheTelemetry.js \
- $(NULL)
--- a/startupcache/test/moz.build
+++ a/startupcache/test/moz.build
@@ -3,8 +3,12 @@
# 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/.
CPP_UNIT_TESTS += [
'TestStartupCache.cpp',
]
+EXTRA_COMPONENTS += [
+ 'TestStartupCacheTelemetry.js',
+ 'TestStartupCacheTelemetry.manifest',
+]
--- a/testing/testsuite-targets.mk
+++ a/testing/testsuite-targets.mk
@@ -508,8 +508,10 @@
ifeq ($(MOZ_WIDGET_TOOLKIT),android)
$(NSINSTALL) $(topsrcdir)/testing/android_cppunittest_manifest.txt $(PKG_STAGE)/cppunittests
endif
+ifeq ($(MOZ_DISABLE_STARTUPCACHE),)
$(NSINSTALL) $(topsrcdir)/startupcache/test/TestStartupCacheTelemetry.js $(PKG_STAGE)/cppunittests
$(NSINSTALL) $(topsrcdir)/startupcache/test/TestStartupCacheTelemetry.manifest $(PKG_STAGE)/cppunittests
+endif
cp -RL $(DIST)/bin/jsapi-tests$(BIN_SUFFIX) $(PKG_STAGE)/cppunittests
stage-jittest: make-stage-dir
|