From f02b04c1694e2ded1f4d05be97efbbe60ae379d2 Mon Sep 17 00:00:00 2001 From: Aleh Zasypkin Date: Tue, 1 Dec 2015 18:14:04 +0100 Subject: [PATCH] Bug 1229381 - [Raptor] "test-startup-limit" app is not included into Raptor distribution. r=eperelman --- build/config/phone/apps-engineering.list | 3 ++- distros/raptor/apps.list | 1 + .../raptor/apps}/test-startup-limit/index.html | 0 .../raptor/apps}/test-startup-limit/js/app.js | 0 .../raptor/apps}/test-startup-limit/js/worker.js | 0 .../raptor/apps}/test-startup-limit/manifest.webapp | 0 .../test-startup-limit/style/icons/default_126.png | Bin .../test-startup-limit/style/icons/default_142.png | Bin .../test-startup-limit/style/icons/default_189.png | Bin .../test-startup-limit/style/icons/default_284.png | Bin .../test-startup-limit/style/icons/default_84.png | Bin .../raptor/apps}/test-startup-limit/style/style.css | 0 .../test/marionette/counter_test.js | 0 13 files changed, 3 insertions(+), 1 deletion(-) rename {dev_apps => distros/raptor/apps}/test-startup-limit/index.html (100%) rename {dev_apps => distros/raptor/apps}/test-startup-limit/js/app.js (100%) rename {dev_apps => distros/raptor/apps}/test-startup-limit/js/worker.js (100%) rename {dev_apps => distros/raptor/apps}/test-startup-limit/manifest.webapp (100%) rename {dev_apps => distros/raptor/apps}/test-startup-limit/style/icons/default_126.png (100%) rename {dev_apps => distros/raptor/apps}/test-startup-limit/style/icons/default_142.png (100%) rename {dev_apps => distros/raptor/apps}/test-startup-limit/style/icons/default_189.png (100%) rename {dev_apps => distros/raptor/apps}/test-startup-limit/style/icons/default_284.png (100%) rename {dev_apps => distros/raptor/apps}/test-startup-limit/style/icons/default_84.png (100%) rename {dev_apps => distros/raptor/apps}/test-startup-limit/style/style.css (100%) rename {dev_apps => distros/raptor/apps}/test-startup-limit/test/marionette/counter_test.js (100%) diff --git a/build/config/phone/apps-engineering.list b/build/config/phone/apps-engineering.list index 35cee763f337..bd9e0086c0ca 100644 --- 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 index 96dd834aff52..80b4eb10902f 100644 --- 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 b/distros/raptor/apps/test-startup-limit/index.html similarity index 100% rename from dev_apps/test-startup-limit/index.html rename to distros/raptor/apps/test-startup-limit/index.html diff --git a/dev_apps/test-startup-limit/js/app.js b/distros/raptor/apps/test-startup-limit/js/app.js similarity index 100% rename from dev_apps/test-startup-limit/js/app.js rename to distros/raptor/apps/test-startup-limit/js/app.js diff --git a/dev_apps/test-startup-limit/js/worker.js b/distros/raptor/apps/test-startup-limit/js/worker.js similarity index 100% rename from dev_apps/test-startup-limit/js/worker.js rename to distros/raptor/apps/test-startup-limit/js/worker.js diff --git a/dev_apps/test-startup-limit/manifest.webapp b/distros/raptor/apps/test-startup-limit/manifest.webapp similarity index 100% rename from dev_apps/test-startup-limit/manifest.webapp rename to distros/raptor/apps/test-startup-limit/manifest.webapp diff --git a/dev_apps/test-startup-limit/style/icons/default_126.png b/distros/raptor/apps/test-startup-limit/style/icons/default_126.png similarity index 100% rename from dev_apps/test-startup-limit/style/icons/default_126.png rename to distros/raptor/apps/test-startup-limit/style/icons/default_126.png diff --git a/dev_apps/test-startup-limit/style/icons/default_142.png b/distros/raptor/apps/test-startup-limit/style/icons/default_142.png similarity index 100% rename from dev_apps/test-startup-limit/style/icons/default_142.png rename to distros/raptor/apps/test-startup-limit/style/icons/default_142.png diff --git a/dev_apps/test-startup-limit/style/icons/default_189.png b/distros/raptor/apps/test-startup-limit/style/icons/default_189.png similarity index 100% rename from dev_apps/test-startup-limit/style/icons/default_189.png rename to distros/raptor/apps/test-startup-limit/style/icons/default_189.png diff --git a/dev_apps/test-startup-limit/style/icons/default_284.png b/distros/raptor/apps/test-startup-limit/style/icons/default_284.png similarity index 100% rename from dev_apps/test-startup-limit/style/icons/default_284.png rename to distros/raptor/apps/test-startup-limit/style/icons/default_284.png diff --git a/dev_apps/test-startup-limit/style/icons/default_84.png b/distros/raptor/apps/test-startup-limit/style/icons/default_84.png similarity index 100% rename from dev_apps/test-startup-limit/style/icons/default_84.png rename to distros/raptor/apps/test-startup-limit/style/icons/default_84.png diff --git a/dev_apps/test-startup-limit/style/style.css b/distros/raptor/apps/test-startup-limit/style/style.css similarity index 100% rename from dev_apps/test-startup-limit/style/style.css rename to distros/raptor/apps/test-startup-limit/style/style.css diff --git a/dev_apps/test-startup-limit/test/marionette/counter_test.js b/distros/raptor/apps/test-startup-limit/test/marionette/counter_test.js similarity index 100% rename from dev_apps/test-startup-limit/test/marionette/counter_test.js rename to distros/raptor/apps/test-startup-limit/test/marionette/counter_test.js