Merge pull request #33469 from azasypkin/bug-1229381-test-startup-limit

Bug 1229381 - [Raptor] "test-startup-limit" app is not included into Raptor distribution. r=eperelman
mozilla-b2g · Dec 2, 2015 · 3f50020 · 3f50020
2 parents d4f147f + f02b04c
commit 3f50020
Show file tree

Hide file tree

Showing 13 changed files with 3 additions and 1 deletion.
diff --git a/build/config/phone/apps-engineering.list b/build/config/phone/apps-engineering.list
@@ -20,7 +20,6 @@ dev_apps/test-otasp
 dev_apps/test-receiver-1
 dev_apps/test-receiver-2
 dev_apps/test-receiver-inline
-dev_apps/test-startup-limit
 dev_apps/test-wappush
 dev_apps/uitest
 dev_apps/uitest-privileged
@@ -36,3 +35,5 @@ dev_apps/music-oga
 apps/settings/test/fixtures/addon1
 apps/settings/test/fixtures/addon2
 apps/settings/test/fixtures/addon3
+
+distros/raptor/apps/test-startup-limit
diff --git a/distros/raptor/apps.list b/distros/raptor/apps.list
@@ -1,2 +1,3 @@
 apps/*
+distros/raptor/apps/*
 distros/raptor/outoftree_apps/*
diff --git a/dev_apps/test-startup-limit/index.html → ...raptor/apps/test-startup-limit/index.html b/dev_apps/test-startup-limit/index.html → ...raptor/apps/test-startup-limit/index.html
diff --git a/dev_apps/test-startup-limit/js/app.js → .../raptor/apps/test-startup-limit/js/app.js b/dev_apps/test-startup-limit/js/app.js → .../raptor/apps/test-startup-limit/js/app.js
diff --git a/dev_apps/test-startup-limit/js/worker.js → ...ptor/apps/test-startup-limit/js/worker.js b/dev_apps/test-startup-limit/js/worker.js → ...ptor/apps/test-startup-limit/js/worker.js
diff --git a/dev_apps/test-startup-limit/manifest.webapp → ...r/apps/test-startup-limit/manifest.webapp b/dev_apps/test-startup-limit/manifest.webapp → ...r/apps/test-startup-limit/manifest.webapp
diff --git a/...startup-limit/style/icons/default_126.png → ...startup-limit/style/icons/default_126.png b/...startup-limit/style/icons/default_126.png → ...startup-limit/style/icons/default_126.png
diff --git a/...startup-limit/style/icons/default_142.png → ...startup-limit/style/icons/default_142.png b/...startup-limit/style/icons/default_142.png → ...startup-limit/style/icons/default_142.png
diff --git a/...startup-limit/style/icons/default_189.png → ...startup-limit/style/icons/default_189.png b/...startup-limit/style/icons/default_189.png → ...startup-limit/style/icons/default_189.png
diff --git a/...startup-limit/style/icons/default_284.png → ...startup-limit/style/icons/default_284.png b/...startup-limit/style/icons/default_284.png → ...startup-limit/style/icons/default_284.png
diff --git a/...-startup-limit/style/icons/default_84.png → ...-startup-limit/style/icons/default_84.png b/...-startup-limit/style/icons/default_84.png → ...-startup-limit/style/icons/default_84.png
diff --git a/dev_apps/test-startup-limit/style/style.css → ...r/apps/test-startup-limit/style/style.css b/dev_apps/test-startup-limit/style/style.css → ...r/apps/test-startup-limit/style/style.css
diff --git a/...tup-limit/test/marionette/counter_test.js → ...tup-limit/test/marionette/counter_test.js b/...tup-limit/test/marionette/counter_test.js → ...tup-limit/test/marionette/counter_test.js