From 197cc1b71ccedee789a533fa95f6044e0ddb1b10 Mon Sep 17 00:00:00 2001 From: Florin Strugariu Date: Wed, 19 Jun 2019 07:44:35 +0000 Subject: [PATCH] Bug 1556760 Organize the test ini file in folders r=perftest-reviewers,alexandru.irimovici,AlexandruIonescu Differential Revision: https://phabricator.services.mozilla.com/D33968 --HG-- rename : testing/raptor/raptor/tests/raptor-assorted-dom.ini => testing/raptor/raptor/tests/benchmarks/raptor-assorted-dom.ini rename : testing/raptor/raptor/tests/raptor-motionmark-animometer.ini => testing/raptor/raptor/tests/benchmarks/raptor-motionmark-animometer.ini rename : testing/raptor/raptor/tests/raptor-motionmark-htmlsuite.ini => testing/raptor/raptor/tests/benchmarks/raptor-motionmark-htmlsuite.ini rename : testing/raptor/raptor/tests/raptor-speedometer.ini => testing/raptor/raptor/tests/benchmarks/raptor-speedometer.ini rename : testing/raptor/raptor/tests/raptor-stylebench.ini => testing/raptor/raptor/tests/benchmarks/raptor-stylebench.ini rename : testing/raptor/raptor/tests/raptor-sunspider.ini => testing/raptor/raptor/tests/benchmarks/raptor-sunspider.ini rename : testing/raptor/raptor/tests/raptor-unity-webgl.ini => testing/raptor/raptor/tests/benchmarks/raptor-unity-webgl.ini rename : testing/raptor/raptor/tests/raptor-wasm-godot-baseline.ini => testing/raptor/raptor/tests/benchmarks/raptor-wasm-godot-baseline.ini rename : testing/raptor/raptor/tests/raptor-wasm-godot-cranelift.ini => testing/raptor/raptor/tests/benchmarks/raptor-wasm-godot-cranelift.ini rename : testing/raptor/raptor/tests/raptor-wasm-godot-ion.ini => testing/raptor/raptor/tests/benchmarks/raptor-wasm-godot-ion.ini rename : testing/raptor/raptor/tests/raptor-wasm-godot.ini => testing/raptor/raptor/tests/benchmarks/raptor-wasm-godot.ini rename : testing/raptor/raptor/tests/raptor-wasm-misc-baseline.ini => testing/raptor/raptor/tests/benchmarks/raptor-wasm-misc-baseline.ini rename : testing/raptor/raptor/tests/raptor-wasm-misc-cranelift.ini => testing/raptor/raptor/tests/benchmarks/raptor-wasm-misc-cranelift.ini rename : testing/raptor/raptor/tests/raptor-wasm-misc-ion.ini => testing/raptor/raptor/tests/benchmarks/raptor-wasm-misc-ion.ini rename : testing/raptor/raptor/tests/raptor-wasm-misc.ini => testing/raptor/raptor/tests/benchmarks/raptor-wasm-misc.ini rename : testing/raptor/raptor/tests/raptor-webaudio.ini => testing/raptor/raptor/tests/benchmarks/raptor-webaudio.ini rename : testing/raptor/raptor/tests/raptor-youtube-playback.ini => testing/raptor/raptor/tests/benchmarks/raptor-youtube-playback.ini rename : testing/raptor/raptor/tests/raptor-scn-power-idle.ini => testing/raptor/raptor/tests/scenario/raptor-scn-power-idle.ini rename : testing/raptor/raptor/tests/raptor-tp6-1.ini => testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-1.ini rename : testing/raptor/raptor/tests/raptor-tp6-10.ini => testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-10.ini rename : testing/raptor/raptor/tests/raptor-tp6-2.ini => testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-2.ini rename : testing/raptor/raptor/tests/raptor-tp6-3.ini => testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-3.ini rename : testing/raptor/raptor/tests/raptor-tp6-4.ini => testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-4.ini rename : testing/raptor/raptor/tests/raptor-tp6-5.ini => testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-5.ini rename : testing/raptor/raptor/tests/raptor-tp6-6.ini => testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-6.ini rename : testing/raptor/raptor/tests/raptor-tp6-7.ini => testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-7.ini rename : testing/raptor/raptor/tests/raptor-tp6-8.ini => testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-8.ini rename : testing/raptor/raptor/tests/raptor-tp6-9.ini => testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-9.ini rename : testing/raptor/raptor/tests/raptor-tp6-binast-1.ini => testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-binast-1.ini rename : testing/raptor/raptor/tests/raptor-tp6-cold-1.ini => testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-cold-1.ini rename : testing/raptor/raptor/tests/raptor-tp6-cold-2.ini => testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-cold-2.ini rename : testing/raptor/raptor/tests/raptor-tp6-cold-3.ini => testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-cold-3.ini rename : testing/raptor/raptor/tests/raptor-tp6-cold-4.ini => testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-cold-4.ini rename : testing/raptor/raptor/tests/raptor-tp6m-1-fennec64.ini => testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-1-fennec64.ini rename : testing/raptor/raptor/tests/raptor-tp6m-1.ini => testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-1.ini rename : testing/raptor/raptor/tests/raptor-tp6m-10-fennec64.ini => testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-10-fennec64.ini rename : testing/raptor/raptor/tests/raptor-tp6m-10.ini => testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-10.ini rename : testing/raptor/raptor/tests/raptor-tp6m-2-fennec64.ini => testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-2-fennec64.ini rename : testing/raptor/raptor/tests/raptor-tp6m-2.ini => testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-2.ini rename : testing/raptor/raptor/tests/raptor-tp6m-3-fennec64.ini => testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-3-fennec64.ini rename : testing/raptor/raptor/tests/raptor-tp6m-3.ini => testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-3.ini rename : testing/raptor/raptor/tests/raptor-tp6m-4-fennec64.ini => testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-4-fennec64.ini rename : testing/raptor/raptor/tests/raptor-tp6m-4.ini => testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-4.ini rename : testing/raptor/raptor/tests/raptor-tp6m-5-fennec64.ini => testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-5-fennec64.ini rename : testing/raptor/raptor/tests/raptor-tp6m-5.ini => testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-5.ini rename : testing/raptor/raptor/tests/raptor-tp6m-6-fennec64.ini => testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-6-fennec64.ini rename : testing/raptor/raptor/tests/raptor-tp6m-6.ini => testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-6.ini rename : testing/raptor/raptor/tests/raptor-tp6m-7-fennec64.ini => testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-7-fennec64.ini rename : testing/raptor/raptor/tests/raptor-tp6m-7.ini => testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-7.ini rename : testing/raptor/raptor/tests/raptor-tp6m-8-fennec64.ini => testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-8-fennec64.ini rename : testing/raptor/raptor/tests/raptor-tp6m-8.ini => testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-8.ini rename : testing/raptor/raptor/tests/raptor-tp6m-9-fennec64.ini => testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-9-fennec64.ini rename : testing/raptor/raptor/tests/raptor-tp6m-9.ini => testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-9.ini rename : testing/raptor/raptor/tests/raptor-tp6m-cold-1-fennec64.ini => testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-1-fennec64.ini rename : testing/raptor/raptor/tests/raptor-tp6m-cold-1.ini => testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-1.ini rename : testing/raptor/raptor/tests/raptor-tp6m-cold-10-fennec64.ini => testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-10-fennec64.ini rename : testing/raptor/raptor/tests/raptor-tp6m-cold-10.ini => testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-10.ini rename : testing/raptor/raptor/tests/raptor-tp6m-cold-11-fennec64.ini => testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-11-fennec64.ini rename : testing/raptor/raptor/tests/raptor-tp6m-cold-11.ini => testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-11.ini rename : testing/raptor/raptor/tests/raptor-tp6m-cold-12-fennec64.ini => testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-12-fennec64.ini rename : testing/raptor/raptor/tests/raptor-tp6m-cold-12.ini => testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-12.ini rename : testing/raptor/raptor/tests/raptor-tp6m-cold-13-fennec64.ini => testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-13-fennec64.ini rename : testing/raptor/raptor/tests/raptor-tp6m-cold-13.ini => testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-13.ini rename : testing/raptor/raptor/tests/raptor-tp6m-cold-14-fennec64.ini => testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-14-fennec64.ini rename : testing/raptor/raptor/tests/raptor-tp6m-cold-14.ini => testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-14.ini rename : testing/raptor/raptor/tests/raptor-tp6m-cold-2-fennec64.ini => testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-2-fennec64.ini rename : testing/raptor/raptor/tests/raptor-tp6m-cold-2.ini => testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-2.ini rename : testing/raptor/raptor/tests/raptor-tp6m-cold-3-fennec64.ini => testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-3-fennec64.ini rename : testing/raptor/raptor/tests/raptor-tp6m-cold-3.ini => testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-3.ini rename : testing/raptor/raptor/tests/raptor-tp6m-cold-4-fennec64.ini => testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-4-fennec64.ini rename : testing/raptor/raptor/tests/raptor-tp6m-cold-4.ini => testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-4.ini rename : testing/raptor/raptor/tests/raptor-tp6m-cold-5-fennec64.ini => testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-5-fennec64.ini rename : testing/raptor/raptor/tests/raptor-tp6m-cold-5.ini => testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-5.ini rename : testing/raptor/raptor/tests/raptor-tp6m-cold-6-fennec64.ini => testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-6-fennec64.ini rename : testing/raptor/raptor/tests/raptor-tp6m-cold-6.ini => testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-6.ini rename : testing/raptor/raptor/tests/raptor-tp6m-cold-7-fennec64.ini => testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-7-fennec64.ini rename : testing/raptor/raptor/tests/raptor-tp6m-cold-7.ini => testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-7.ini rename : testing/raptor/raptor/tests/raptor-tp6m-cold-8-fennec64.ini => testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-8-fennec64.ini rename : testing/raptor/raptor/tests/raptor-tp6m-cold-8.ini => testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-8.ini rename : testing/raptor/raptor/tests/raptor-tp6m-cold-9-fennec64.ini => testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-9-fennec64.ini rename : testing/raptor/raptor/tests/raptor-tp6m-cold-9.ini => testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-9.ini extra : moz-landing-system : lando --- .hgignore | 2 +- testing/raptor/raptor/control_server.py | 4 +- testing/raptor/raptor/gen_test_config.py | 2 +- testing/raptor/raptor/manifest.py | 7 +- testing/raptor/raptor/raptor.ini | 162 +++++++++--------- .../{ => benchmarks}/raptor-assorted-dom.ini | 0 .../raptor-motionmark-animometer.ini | 0 .../raptor-motionmark-htmlsuite.ini | 0 .../{ => benchmarks}/raptor-speedometer.ini | 0 .../{ => benchmarks}/raptor-stylebench.ini | 0 .../{ => benchmarks}/raptor-sunspider.ini | 0 .../{ => benchmarks}/raptor-unity-webgl.ini | 0 .../raptor-wasm-godot-baseline.ini | 0 .../raptor-wasm-godot-cranelift.ini | 0 .../raptor-wasm-godot-ion.ini | 0 .../{ => benchmarks}/raptor-wasm-godot.ini | 0 .../raptor-wasm-misc-baseline.ini | 0 .../raptor-wasm-misc-cranelift.ini | 0 .../{ => benchmarks}/raptor-wasm-misc-ion.ini | 0 .../{ => benchmarks}/raptor-wasm-misc.ini | 0 .../{ => benchmarks}/raptor-webaudio.ini | 0 .../raptor-youtube-playback.ini | 0 .../{ => scenario}/raptor-scn-power-idle.ini | 0 .../tests/{ => tp6/desktop}/raptor-tp6-1.ini | 0 .../tests/{ => tp6/desktop}/raptor-tp6-10.ini | 0 .../tests/{ => tp6/desktop}/raptor-tp6-2.ini | 0 .../tests/{ => tp6/desktop}/raptor-tp6-3.ini | 0 .../tests/{ => tp6/desktop}/raptor-tp6-4.ini | 0 .../tests/{ => tp6/desktop}/raptor-tp6-5.ini | 0 .../tests/{ => tp6/desktop}/raptor-tp6-6.ini | 0 .../tests/{ => tp6/desktop}/raptor-tp6-7.ini | 0 .../tests/{ => tp6/desktop}/raptor-tp6-8.ini | 0 .../tests/{ => tp6/desktop}/raptor-tp6-9.ini | 0 .../{ => tp6/desktop}/raptor-tp6-binast-1.ini | 0 .../{ => tp6/desktop}/raptor-tp6-cold-1.ini | 0 .../{ => tp6/desktop}/raptor-tp6-cold-2.ini | 0 .../{ => tp6/desktop}/raptor-tp6-cold-3.ini | 0 .../{ => tp6/desktop}/raptor-tp6-cold-4.ini | 0 .../mobile}/raptor-tp6m-1-fennec64.ini | 0 .../tests/{ => tp6/mobile}/raptor-tp6m-1.ini | 0 .../mobile}/raptor-tp6m-10-fennec64.ini | 0 .../tests/{ => tp6/mobile}/raptor-tp6m-10.ini | 0 .../mobile}/raptor-tp6m-2-fennec64.ini | 0 .../tests/{ => tp6/mobile}/raptor-tp6m-2.ini | 0 .../mobile}/raptor-tp6m-3-fennec64.ini | 0 .../tests/{ => tp6/mobile}/raptor-tp6m-3.ini | 0 .../mobile}/raptor-tp6m-4-fennec64.ini | 0 .../tests/{ => tp6/mobile}/raptor-tp6m-4.ini | 0 .../mobile}/raptor-tp6m-5-fennec64.ini | 0 .../tests/{ => tp6/mobile}/raptor-tp6m-5.ini | 0 .../mobile}/raptor-tp6m-6-fennec64.ini | 0 .../tests/{ => tp6/mobile}/raptor-tp6m-6.ini | 0 .../mobile}/raptor-tp6m-7-fennec64.ini | 0 .../tests/{ => tp6/mobile}/raptor-tp6m-7.ini | 0 .../mobile}/raptor-tp6m-8-fennec64.ini | 0 .../tests/{ => tp6/mobile}/raptor-tp6m-8.ini | 0 .../mobile}/raptor-tp6m-9-fennec64.ini | 0 .../tests/{ => tp6/mobile}/raptor-tp6m-9.ini | 0 .../mobile}/raptor-tp6m-cold-1-fennec64.ini | 0 .../{ => tp6/mobile}/raptor-tp6m-cold-1.ini | 0 .../mobile}/raptor-tp6m-cold-10-fennec64.ini | 0 .../{ => tp6/mobile}/raptor-tp6m-cold-10.ini | 0 .../mobile}/raptor-tp6m-cold-11-fennec64.ini | 0 .../{ => tp6/mobile}/raptor-tp6m-cold-11.ini | 0 .../mobile}/raptor-tp6m-cold-12-fennec64.ini | 0 .../{ => tp6/mobile}/raptor-tp6m-cold-12.ini | 0 .../mobile}/raptor-tp6m-cold-13-fennec64.ini | 0 .../{ => tp6/mobile}/raptor-tp6m-cold-13.ini | 0 .../mobile}/raptor-tp6m-cold-14-fennec64.ini | 0 .../{ => tp6/mobile}/raptor-tp6m-cold-14.ini | 0 .../mobile}/raptor-tp6m-cold-2-fennec64.ini | 0 .../{ => tp6/mobile}/raptor-tp6m-cold-2.ini | 0 .../mobile}/raptor-tp6m-cold-3-fennec64.ini | 0 .../{ => tp6/mobile}/raptor-tp6m-cold-3.ini | 0 .../mobile}/raptor-tp6m-cold-4-fennec64.ini | 0 .../{ => tp6/mobile}/raptor-tp6m-cold-4.ini | 0 .../mobile}/raptor-tp6m-cold-5-fennec64.ini | 0 .../{ => tp6/mobile}/raptor-tp6m-cold-5.ini | 0 .../mobile}/raptor-tp6m-cold-6-fennec64.ini | 0 .../{ => tp6/mobile}/raptor-tp6m-cold-6.ini | 0 .../mobile}/raptor-tp6m-cold-7-fennec64.ini | 0 .../{ => tp6/mobile}/raptor-tp6m-cold-7.ini | 0 .../mobile}/raptor-tp6m-cold-8-fennec64.ini | 0 .../{ => tp6/mobile}/raptor-tp6m-cold-8.ini | 0 .../mobile}/raptor-tp6m-cold-9-fennec64.ini | 0 .../{ => tp6/mobile}/raptor-tp6m-cold-9.ini | 0 86 files changed, 91 insertions(+), 86 deletions(-) rename testing/raptor/raptor/tests/{ => benchmarks}/raptor-assorted-dom.ini (100%) rename testing/raptor/raptor/tests/{ => benchmarks}/raptor-motionmark-animometer.ini (100%) rename testing/raptor/raptor/tests/{ => benchmarks}/raptor-motionmark-htmlsuite.ini (100%) rename testing/raptor/raptor/tests/{ => benchmarks}/raptor-speedometer.ini (100%) rename testing/raptor/raptor/tests/{ => benchmarks}/raptor-stylebench.ini (100%) rename testing/raptor/raptor/tests/{ => benchmarks}/raptor-sunspider.ini (100%) rename testing/raptor/raptor/tests/{ => benchmarks}/raptor-unity-webgl.ini (100%) rename testing/raptor/raptor/tests/{ => benchmarks}/raptor-wasm-godot-baseline.ini (100%) rename testing/raptor/raptor/tests/{ => benchmarks}/raptor-wasm-godot-cranelift.ini (100%) rename testing/raptor/raptor/tests/{ => benchmarks}/raptor-wasm-godot-ion.ini (100%) rename testing/raptor/raptor/tests/{ => benchmarks}/raptor-wasm-godot.ini (100%) rename testing/raptor/raptor/tests/{ => benchmarks}/raptor-wasm-misc-baseline.ini (100%) rename testing/raptor/raptor/tests/{ => benchmarks}/raptor-wasm-misc-cranelift.ini (100%) rename testing/raptor/raptor/tests/{ => benchmarks}/raptor-wasm-misc-ion.ini (100%) rename testing/raptor/raptor/tests/{ => benchmarks}/raptor-wasm-misc.ini (100%) rename testing/raptor/raptor/tests/{ => benchmarks}/raptor-webaudio.ini (100%) rename testing/raptor/raptor/tests/{ => benchmarks}/raptor-youtube-playback.ini (100%) rename testing/raptor/raptor/tests/{ => scenario}/raptor-scn-power-idle.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/desktop}/raptor-tp6-1.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/desktop}/raptor-tp6-10.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/desktop}/raptor-tp6-2.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/desktop}/raptor-tp6-3.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/desktop}/raptor-tp6-4.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/desktop}/raptor-tp6-5.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/desktop}/raptor-tp6-6.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/desktop}/raptor-tp6-7.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/desktop}/raptor-tp6-8.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/desktop}/raptor-tp6-9.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/desktop}/raptor-tp6-binast-1.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/desktop}/raptor-tp6-cold-1.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/desktop}/raptor-tp6-cold-2.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/desktop}/raptor-tp6-cold-3.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/desktop}/raptor-tp6-cold-4.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/mobile}/raptor-tp6m-1-fennec64.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/mobile}/raptor-tp6m-1.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/mobile}/raptor-tp6m-10-fennec64.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/mobile}/raptor-tp6m-10.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/mobile}/raptor-tp6m-2-fennec64.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/mobile}/raptor-tp6m-2.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/mobile}/raptor-tp6m-3-fennec64.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/mobile}/raptor-tp6m-3.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/mobile}/raptor-tp6m-4-fennec64.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/mobile}/raptor-tp6m-4.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/mobile}/raptor-tp6m-5-fennec64.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/mobile}/raptor-tp6m-5.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/mobile}/raptor-tp6m-6-fennec64.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/mobile}/raptor-tp6m-6.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/mobile}/raptor-tp6m-7-fennec64.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/mobile}/raptor-tp6m-7.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/mobile}/raptor-tp6m-8-fennec64.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/mobile}/raptor-tp6m-8.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/mobile}/raptor-tp6m-9-fennec64.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/mobile}/raptor-tp6m-9.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/mobile}/raptor-tp6m-cold-1-fennec64.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/mobile}/raptor-tp6m-cold-1.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/mobile}/raptor-tp6m-cold-10-fennec64.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/mobile}/raptor-tp6m-cold-10.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/mobile}/raptor-tp6m-cold-11-fennec64.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/mobile}/raptor-tp6m-cold-11.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/mobile}/raptor-tp6m-cold-12-fennec64.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/mobile}/raptor-tp6m-cold-12.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/mobile}/raptor-tp6m-cold-13-fennec64.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/mobile}/raptor-tp6m-cold-13.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/mobile}/raptor-tp6m-cold-14-fennec64.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/mobile}/raptor-tp6m-cold-14.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/mobile}/raptor-tp6m-cold-2-fennec64.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/mobile}/raptor-tp6m-cold-2.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/mobile}/raptor-tp6m-cold-3-fennec64.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/mobile}/raptor-tp6m-cold-3.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/mobile}/raptor-tp6m-cold-4-fennec64.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/mobile}/raptor-tp6m-cold-4.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/mobile}/raptor-tp6m-cold-5-fennec64.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/mobile}/raptor-tp6m-cold-5.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/mobile}/raptor-tp6m-cold-6-fennec64.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/mobile}/raptor-tp6m-cold-6.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/mobile}/raptor-tp6m-cold-7-fennec64.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/mobile}/raptor-tp6m-cold-7.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/mobile}/raptor-tp6m-cold-8-fennec64.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/mobile}/raptor-tp6m-cold-8.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/mobile}/raptor-tp6m-cold-9-fennec64.ini (100%) rename testing/raptor/raptor/tests/{ => tp6/mobile}/raptor-tp6m-cold-9.ini (100%) diff --git a/.hgignore b/.hgignore index 2c2af4047eef..5f1db1f6f3b1 100644 --- a/.hgignore +++ b/.hgignore @@ -190,7 +190,7 @@ tps_result\.json # Ignore various raptor performance framework files ^testing/raptor/.raptor-venv ^testing/raptor/raptor-venv -^testing/raptor/raptor/tests/.*.json +^testing/raptor/raptor/tests/json/ ^testing/raptor/webext/raptor/auto_gen_test_config.js # Ignore browsertime output directory diff --git a/testing/raptor/raptor/control_server.py b/testing/raptor/raptor/control_server.py index ce9f934aa8b5..508297100ba2 100644 --- a/testing/raptor/raptor/control_server.py +++ b/testing/raptor/raptor/control_server.py @@ -116,9 +116,9 @@ def MakeCustomHandlerClass(results_handler, shutdown_browser, write_raw_gecko_pr head, tail = os.path.split(self.path) if tail.startswith('raptor') and tail.endswith('.json'): - LOG.info('reading test settings from ' + tail) + LOG.info('reading test settings from json/' + tail) try: - with open(tail) as json_settings: + with open("json/{}".format(tail)) as json_settings: self.send_header('Access-Control-Allow-Origin', '*') self.send_header('Content-type', 'application/json') self.end_headers() diff --git a/testing/raptor/raptor/gen_test_config.py b/testing/raptor/raptor/gen_test_config.py index e79ac567af4b..30bbf310d94e 100644 --- a/testing/raptor/raptor/gen_test_config.py +++ b/testing/raptor/raptor/gen_test_config.py @@ -23,7 +23,7 @@ function getTestConfig() { return {"browser": "%s", "cs_port": "%d", "test_name": "%s", - "test_settings_url": "http://%s:%d/%s.json", + "test_settings_url": "http://%s:%d/json/%s.json", "post_startup_delay": "%s", "benchmark_port": "%d", "host": "%s", diff --git a/testing/raptor/raptor/manifest.py b/testing/raptor/raptor/manifest.py index 6c0347742373..6766b1988c53 100644 --- a/testing/raptor/raptor/manifest.py +++ b/testing/raptor/raptor/manifest.py @@ -212,7 +212,12 @@ def write_test_settings_json(args, test_details, oskey): if test_details['type'] == "scenario": test_settings['raptor-options']['scenario_time'] = test_details['scenario_time'] - settings_file = os.path.join(tests_dir, test_details['name'] + '.json') + jsons_dir = os.path.join(tests_dir, 'json') + + if not os.path.exists(jsons_dir): + os.mkdir(os.path.join(tests_dir, 'json')) + + settings_file = os.path.join(jsons_dir, test_details['name'] + '.json') try: with open(settings_file, 'w') as out_file: json.dump(test_settings, out_file, indent=4, ensure_ascii=False) diff --git a/testing/raptor/raptor/raptor.ini b/testing/raptor/raptor/raptor.ini index 546f7ebdd44b..ba5414afa1a8 100644 --- a/testing/raptor/raptor/raptor.ini +++ b/testing/raptor/raptor/raptor.ini @@ -1,94 +1,94 @@ # raptor warm pageload tests desktop -[include:tests/raptor-tp6-1.ini] -[include:tests/raptor-tp6-2.ini] -[include:tests/raptor-tp6-3.ini] -[include:tests/raptor-tp6-4.ini] -[include:tests/raptor-tp6-5.ini] -[include:tests/raptor-tp6-6.ini] -[include:tests/raptor-tp6-7.ini] -[include:tests/raptor-tp6-8.ini] -[include:tests/raptor-tp6-9.ini] -[include:tests/raptor-tp6-10.ini] +[include:tests/tp6/desktop/raptor-tp6-1.ini] +[include:tests/tp6/desktop/raptor-tp6-2.ini] +[include:tests/tp6/desktop/raptor-tp6-3.ini] +[include:tests/tp6/desktop/raptor-tp6-4.ini] +[include:tests/tp6/desktop/raptor-tp6-5.ini] +[include:tests/tp6/desktop/raptor-tp6-6.ini] +[include:tests/tp6/desktop/raptor-tp6-7.ini] +[include:tests/tp6/desktop/raptor-tp6-8.ini] +[include:tests/tp6/desktop/raptor-tp6-9.ini] +[include:tests/tp6/desktop/raptor-tp6-10.ini] # raptor cold pageload tests desktop -[include:tests/raptor-tp6-cold-1.ini] -[include:tests/raptor-tp6-cold-2.ini] -[include:tests/raptor-tp6-cold-3.ini] -[include:tests/raptor-tp6-cold-4.ini] +[include:tests/tp6/desktop/raptor-tp6-cold-1.ini] +[include:tests/tp6/desktop/raptor-tp6-cold-2.ini] +[include:tests/tp6/desktop/raptor-tp6-cold-3.ini] +[include:tests/tp6/desktop/raptor-tp6-cold-4.ini] # raptor pageload binast tests desktop -[include:tests/raptor-tp6-binast-1.ini] +[include:tests/tp6/desktop/raptor-tp6-binast-1.ini] # raptor warm pageload tests mobile -[include:tests/raptor-tp6m-1.ini] -[include:tests/raptor-tp6m-2.ini] -[include:tests/raptor-tp6m-3.ini] -[include:tests/raptor-tp6m-4.ini] -[include:tests/raptor-tp6m-5.ini] -[include:tests/raptor-tp6m-6.ini] -[include:tests/raptor-tp6m-7.ini] -[include:tests/raptor-tp6m-8.ini] -[include:tests/raptor-tp6m-9.ini] -[include:tests/raptor-tp6m-10.ini] -[include:tests/raptor-tp6m-1-fennec64.ini] -[include:tests/raptor-tp6m-2-fennec64.ini] -[include:tests/raptor-tp6m-3-fennec64.ini] -[include:tests/raptor-tp6m-4-fennec64.ini] -[include:tests/raptor-tp6m-5-fennec64.ini] -[include:tests/raptor-tp6m-6-fennec64.ini] -[include:tests/raptor-tp6m-7-fennec64.ini] -[include:tests/raptor-tp6m-8-fennec64.ini] -[include:tests/raptor-tp6m-9-fennec64.ini] -[include:tests/raptor-tp6m-10-fennec64.ini] +[include:tests/tp6/mobile/raptor-tp6m-1.ini] +[include:tests/tp6/mobile/raptor-tp6m-2.ini] +[include:tests/tp6/mobile/raptor-tp6m-3.ini] +[include:tests/tp6/mobile/raptor-tp6m-4.ini] +[include:tests/tp6/mobile/raptor-tp6m-5.ini] +[include:tests/tp6/mobile/raptor-tp6m-6.ini] +[include:tests/tp6/mobile/raptor-tp6m-7.ini] +[include:tests/tp6/mobile/raptor-tp6m-8.ini] +[include:tests/tp6/mobile/raptor-tp6m-9.ini] +[include:tests/tp6/mobile/raptor-tp6m-10.ini] +[include:tests/tp6/mobile/raptor-tp6m-1-fennec64.ini] +[include:tests/tp6/mobile/raptor-tp6m-2-fennec64.ini] +[include:tests/tp6/mobile/raptor-tp6m-3-fennec64.ini] +[include:tests/tp6/mobile/raptor-tp6m-4-fennec64.ini] +[include:tests/tp6/mobile/raptor-tp6m-5-fennec64.ini] +[include:tests/tp6/mobile/raptor-tp6m-6-fennec64.ini] +[include:tests/tp6/mobile/raptor-tp6m-7-fennec64.ini] +[include:tests/tp6/mobile/raptor-tp6m-8-fennec64.ini] +[include:tests/tp6/mobile/raptor-tp6m-9-fennec64.ini] +[include:tests/tp6/mobile/raptor-tp6m-10-fennec64.ini] # raptor cold pageload tests mobile -[include:tests/raptor-tp6m-cold-1.ini] -[include:tests/raptor-tp6m-cold-2.ini] -[include:tests/raptor-tp6m-cold-3.ini] -[include:tests/raptor-tp6m-cold-4.ini] -[include:tests/raptor-tp6m-cold-5.ini] -[include:tests/raptor-tp6m-cold-6.ini] -[include:tests/raptor-tp6m-cold-7.ini] -[include:tests/raptor-tp6m-cold-8.ini] -[include:tests/raptor-tp6m-cold-9.ini] -[include:tests/raptor-tp6m-cold-10.ini] -[include:tests/raptor-tp6m-cold-11.ini] -[include:tests/raptor-tp6m-cold-12.ini] -[include:tests/raptor-tp6m-cold-13.ini] -[include:tests/raptor-tp6m-cold-14.ini] -[include:tests/raptor-tp6m-cold-1-fennec64.ini] -[include:tests/raptor-tp6m-cold-2-fennec64.ini] -[include:tests/raptor-tp6m-cold-3-fennec64.ini] -[include:tests/raptor-tp6m-cold-4-fennec64.ini] -[include:tests/raptor-tp6m-cold-5-fennec64.ini] -[include:tests/raptor-tp6m-cold-6-fennec64.ini] -[include:tests/raptor-tp6m-cold-7-fennec64.ini] -[include:tests/raptor-tp6m-cold-8-fennec64.ini] -[include:tests/raptor-tp6m-cold-9-fennec64.ini] -[include:tests/raptor-tp6m-cold-10-fennec64.ini] -[include:tests/raptor-tp6m-cold-11-fennec64.ini] -[include:tests/raptor-tp6m-cold-12-fennec64.ini] -[include:tests/raptor-tp6m-cold-13-fennec64.ini] -[include:tests/raptor-tp6m-cold-14-fennec64.ini] +[include:tests/tp6/mobile/raptor-tp6m-cold-1.ini] +[include:tests/tp6/mobile/raptor-tp6m-cold-2.ini] +[include:tests/tp6/mobile/raptor-tp6m-cold-3.ini] +[include:tests/tp6/mobile/raptor-tp6m-cold-4.ini] +[include:tests/tp6/mobile/raptor-tp6m-cold-5.ini] +[include:tests/tp6/mobile/raptor-tp6m-cold-6.ini] +[include:tests/tp6/mobile/raptor-tp6m-cold-7.ini] +[include:tests/tp6/mobile/raptor-tp6m-cold-8.ini] +[include:tests/tp6/mobile/raptor-tp6m-cold-9.ini] +[include:tests/tp6/mobile/raptor-tp6m-cold-10.ini] +[include:tests/tp6/mobile/raptor-tp6m-cold-11.ini] +[include:tests/tp6/mobile/raptor-tp6m-cold-12.ini] +[include:tests/tp6/mobile/raptor-tp6m-cold-13.ini] +[include:tests/tp6/mobile/raptor-tp6m-cold-14.ini] +[include:tests/tp6/mobile/raptor-tp6m-cold-1-fennec64.ini] +[include:tests/tp6/mobile/raptor-tp6m-cold-2-fennec64.ini] +[include:tests/tp6/mobile/raptor-tp6m-cold-3-fennec64.ini] +[include:tests/tp6/mobile/raptor-tp6m-cold-4-fennec64.ini] +[include:tests/tp6/mobile/raptor-tp6m-cold-5-fennec64.ini] +[include:tests/tp6/mobile/raptor-tp6m-cold-6-fennec64.ini] +[include:tests/tp6/mobile/raptor-tp6m-cold-7-fennec64.ini] +[include:tests/tp6/mobile/raptor-tp6m-cold-8-fennec64.ini] +[include:tests/tp6/mobile/raptor-tp6m-cold-9-fennec64.ini] +[include:tests/tp6/mobile/raptor-tp6m-cold-10-fennec64.ini] +[include:tests/tp6/mobile/raptor-tp6m-cold-11-fennec64.ini] +[include:tests/tp6/mobile/raptor-tp6m-cold-12-fennec64.ini] +[include:tests/tp6/mobile/raptor-tp6m-cold-13-fennec64.ini] +[include:tests/tp6/mobile/raptor-tp6m-cold-14-fennec64.ini] # raptor benchmark tests -[include:tests/raptor-assorted-dom.ini] -[include:tests/raptor-motionmark-animometer.ini] -[include:tests/raptor-motionmark-htmlsuite.ini] -[include:tests/raptor-speedometer.ini] -[include:tests/raptor-stylebench.ini] -[include:tests/raptor-sunspider.ini] -[include:tests/raptor-unity-webgl.ini] -[include:tests/raptor-youtube-playback.ini] -[include:tests/raptor-wasm-godot.ini] -[include:tests/raptor-wasm-godot-baseline.ini] -[include:tests/raptor-wasm-godot-ion.ini] -[include:tests/raptor-wasm-godot-cranelift.ini] -[include:tests/raptor-wasm-misc.ini] -[include:tests/raptor-wasm-misc-baseline.ini] -[include:tests/raptor-wasm-misc-ion.ini] -[include:tests/raptor-wasm-misc-cranelift.ini] -[include:tests/raptor-webaudio.ini] +[include:tests/benchmarks/raptor-assorted-dom.ini] +[include:tests/benchmarks/raptor-motionmark-animometer.ini] +[include:tests/benchmarks/raptor-motionmark-htmlsuite.ini] +[include:tests/benchmarks/raptor-speedometer.ini] +[include:tests/benchmarks/raptor-stylebench.ini] +[include:tests/benchmarks/raptor-sunspider.ini] +[include:tests/benchmarks/raptor-unity-webgl.ini] +[include:tests/benchmarks/raptor-youtube-playback.ini] +[include:tests/benchmarks/raptor-wasm-godot.ini] +[include:tests/benchmarks/raptor-wasm-godot-baseline.ini] +[include:tests/benchmarks/raptor-wasm-godot-ion.ini] +[include:tests/benchmarks/raptor-wasm-godot-cranelift.ini] +[include:tests/benchmarks/raptor-wasm-misc.ini] +[include:tests/benchmarks/raptor-wasm-misc-baseline.ini] +[include:tests/benchmarks/raptor-wasm-misc-ion.ini] +[include:tests/benchmarks/raptor-wasm-misc-cranelift.ini] +[include:tests/benchmarks/raptor-webaudio.ini] # raptor scenario tests -[include:tests/raptor-scn-power-idle.ini] +[include:tests/scenario/raptor-scn-power-idle.ini] diff --git a/testing/raptor/raptor/tests/raptor-assorted-dom.ini b/testing/raptor/raptor/tests/benchmarks/raptor-assorted-dom.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-assorted-dom.ini rename to testing/raptor/raptor/tests/benchmarks/raptor-assorted-dom.ini diff --git a/testing/raptor/raptor/tests/raptor-motionmark-animometer.ini b/testing/raptor/raptor/tests/benchmarks/raptor-motionmark-animometer.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-motionmark-animometer.ini rename to testing/raptor/raptor/tests/benchmarks/raptor-motionmark-animometer.ini diff --git a/testing/raptor/raptor/tests/raptor-motionmark-htmlsuite.ini b/testing/raptor/raptor/tests/benchmarks/raptor-motionmark-htmlsuite.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-motionmark-htmlsuite.ini rename to testing/raptor/raptor/tests/benchmarks/raptor-motionmark-htmlsuite.ini diff --git a/testing/raptor/raptor/tests/raptor-speedometer.ini b/testing/raptor/raptor/tests/benchmarks/raptor-speedometer.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-speedometer.ini rename to testing/raptor/raptor/tests/benchmarks/raptor-speedometer.ini diff --git a/testing/raptor/raptor/tests/raptor-stylebench.ini b/testing/raptor/raptor/tests/benchmarks/raptor-stylebench.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-stylebench.ini rename to testing/raptor/raptor/tests/benchmarks/raptor-stylebench.ini diff --git a/testing/raptor/raptor/tests/raptor-sunspider.ini b/testing/raptor/raptor/tests/benchmarks/raptor-sunspider.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-sunspider.ini rename to testing/raptor/raptor/tests/benchmarks/raptor-sunspider.ini diff --git a/testing/raptor/raptor/tests/raptor-unity-webgl.ini b/testing/raptor/raptor/tests/benchmarks/raptor-unity-webgl.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-unity-webgl.ini rename to testing/raptor/raptor/tests/benchmarks/raptor-unity-webgl.ini diff --git a/testing/raptor/raptor/tests/raptor-wasm-godot-baseline.ini b/testing/raptor/raptor/tests/benchmarks/raptor-wasm-godot-baseline.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-wasm-godot-baseline.ini rename to testing/raptor/raptor/tests/benchmarks/raptor-wasm-godot-baseline.ini diff --git a/testing/raptor/raptor/tests/raptor-wasm-godot-cranelift.ini b/testing/raptor/raptor/tests/benchmarks/raptor-wasm-godot-cranelift.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-wasm-godot-cranelift.ini rename to testing/raptor/raptor/tests/benchmarks/raptor-wasm-godot-cranelift.ini diff --git a/testing/raptor/raptor/tests/raptor-wasm-godot-ion.ini b/testing/raptor/raptor/tests/benchmarks/raptor-wasm-godot-ion.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-wasm-godot-ion.ini rename to testing/raptor/raptor/tests/benchmarks/raptor-wasm-godot-ion.ini diff --git a/testing/raptor/raptor/tests/raptor-wasm-godot.ini b/testing/raptor/raptor/tests/benchmarks/raptor-wasm-godot.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-wasm-godot.ini rename to testing/raptor/raptor/tests/benchmarks/raptor-wasm-godot.ini diff --git a/testing/raptor/raptor/tests/raptor-wasm-misc-baseline.ini b/testing/raptor/raptor/tests/benchmarks/raptor-wasm-misc-baseline.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-wasm-misc-baseline.ini rename to testing/raptor/raptor/tests/benchmarks/raptor-wasm-misc-baseline.ini diff --git a/testing/raptor/raptor/tests/raptor-wasm-misc-cranelift.ini b/testing/raptor/raptor/tests/benchmarks/raptor-wasm-misc-cranelift.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-wasm-misc-cranelift.ini rename to testing/raptor/raptor/tests/benchmarks/raptor-wasm-misc-cranelift.ini diff --git a/testing/raptor/raptor/tests/raptor-wasm-misc-ion.ini b/testing/raptor/raptor/tests/benchmarks/raptor-wasm-misc-ion.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-wasm-misc-ion.ini rename to testing/raptor/raptor/tests/benchmarks/raptor-wasm-misc-ion.ini diff --git a/testing/raptor/raptor/tests/raptor-wasm-misc.ini b/testing/raptor/raptor/tests/benchmarks/raptor-wasm-misc.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-wasm-misc.ini rename to testing/raptor/raptor/tests/benchmarks/raptor-wasm-misc.ini diff --git a/testing/raptor/raptor/tests/raptor-webaudio.ini b/testing/raptor/raptor/tests/benchmarks/raptor-webaudio.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-webaudio.ini rename to testing/raptor/raptor/tests/benchmarks/raptor-webaudio.ini diff --git a/testing/raptor/raptor/tests/raptor-youtube-playback.ini b/testing/raptor/raptor/tests/benchmarks/raptor-youtube-playback.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-youtube-playback.ini rename to testing/raptor/raptor/tests/benchmarks/raptor-youtube-playback.ini diff --git a/testing/raptor/raptor/tests/raptor-scn-power-idle.ini b/testing/raptor/raptor/tests/scenario/raptor-scn-power-idle.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-scn-power-idle.ini rename to testing/raptor/raptor/tests/scenario/raptor-scn-power-idle.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6-1.ini b/testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-1.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6-1.ini rename to testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-1.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6-10.ini b/testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-10.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6-10.ini rename to testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-10.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6-2.ini b/testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-2.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6-2.ini rename to testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-2.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6-3.ini b/testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-3.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6-3.ini rename to testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-3.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6-4.ini b/testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-4.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6-4.ini rename to testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-4.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6-5.ini b/testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-5.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6-5.ini rename to testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-5.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6-6.ini b/testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-6.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6-6.ini rename to testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-6.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6-7.ini b/testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-7.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6-7.ini rename to testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-7.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6-8.ini b/testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-8.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6-8.ini rename to testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-8.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6-9.ini b/testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-9.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6-9.ini rename to testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-9.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6-binast-1.ini b/testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-binast-1.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6-binast-1.ini rename to testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-binast-1.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6-cold-1.ini b/testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-cold-1.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6-cold-1.ini rename to testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-cold-1.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6-cold-2.ini b/testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-cold-2.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6-cold-2.ini rename to testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-cold-2.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6-cold-3.ini b/testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-cold-3.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6-cold-3.ini rename to testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-cold-3.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6-cold-4.ini b/testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-cold-4.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6-cold-4.ini rename to testing/raptor/raptor/tests/tp6/desktop/raptor-tp6-cold-4.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6m-1-fennec64.ini b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-1-fennec64.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6m-1-fennec64.ini rename to testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-1-fennec64.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6m-1.ini b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-1.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6m-1.ini rename to testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-1.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6m-10-fennec64.ini b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-10-fennec64.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6m-10-fennec64.ini rename to testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-10-fennec64.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6m-10.ini b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-10.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6m-10.ini rename to testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-10.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6m-2-fennec64.ini b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-2-fennec64.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6m-2-fennec64.ini rename to testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-2-fennec64.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6m-2.ini b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-2.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6m-2.ini rename to testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-2.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6m-3-fennec64.ini b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-3-fennec64.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6m-3-fennec64.ini rename to testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-3-fennec64.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6m-3.ini b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-3.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6m-3.ini rename to testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-3.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6m-4-fennec64.ini b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-4-fennec64.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6m-4-fennec64.ini rename to testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-4-fennec64.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6m-4.ini b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-4.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6m-4.ini rename to testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-4.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6m-5-fennec64.ini b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-5-fennec64.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6m-5-fennec64.ini rename to testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-5-fennec64.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6m-5.ini b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-5.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6m-5.ini rename to testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-5.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6m-6-fennec64.ini b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-6-fennec64.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6m-6-fennec64.ini rename to testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-6-fennec64.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6m-6.ini b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-6.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6m-6.ini rename to testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-6.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6m-7-fennec64.ini b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-7-fennec64.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6m-7-fennec64.ini rename to testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-7-fennec64.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6m-7.ini b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-7.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6m-7.ini rename to testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-7.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6m-8-fennec64.ini b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-8-fennec64.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6m-8-fennec64.ini rename to testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-8-fennec64.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6m-8.ini b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-8.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6m-8.ini rename to testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-8.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6m-9-fennec64.ini b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-9-fennec64.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6m-9-fennec64.ini rename to testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-9-fennec64.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6m-9.ini b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-9.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6m-9.ini rename to testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-9.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6m-cold-1-fennec64.ini b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-1-fennec64.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6m-cold-1-fennec64.ini rename to testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-1-fennec64.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6m-cold-1.ini b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-1.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6m-cold-1.ini rename to testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-1.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6m-cold-10-fennec64.ini b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-10-fennec64.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6m-cold-10-fennec64.ini rename to testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-10-fennec64.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6m-cold-10.ini b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-10.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6m-cold-10.ini rename to testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-10.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6m-cold-11-fennec64.ini b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-11-fennec64.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6m-cold-11-fennec64.ini rename to testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-11-fennec64.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6m-cold-11.ini b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-11.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6m-cold-11.ini rename to testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-11.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6m-cold-12-fennec64.ini b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-12-fennec64.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6m-cold-12-fennec64.ini rename to testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-12-fennec64.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6m-cold-12.ini b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-12.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6m-cold-12.ini rename to testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-12.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6m-cold-13-fennec64.ini b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-13-fennec64.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6m-cold-13-fennec64.ini rename to testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-13-fennec64.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6m-cold-13.ini b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-13.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6m-cold-13.ini rename to testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-13.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6m-cold-14-fennec64.ini b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-14-fennec64.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6m-cold-14-fennec64.ini rename to testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-14-fennec64.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6m-cold-14.ini b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-14.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6m-cold-14.ini rename to testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-14.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6m-cold-2-fennec64.ini b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-2-fennec64.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6m-cold-2-fennec64.ini rename to testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-2-fennec64.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6m-cold-2.ini b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-2.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6m-cold-2.ini rename to testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-2.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6m-cold-3-fennec64.ini b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-3-fennec64.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6m-cold-3-fennec64.ini rename to testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-3-fennec64.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6m-cold-3.ini b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-3.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6m-cold-3.ini rename to testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-3.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6m-cold-4-fennec64.ini b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-4-fennec64.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6m-cold-4-fennec64.ini rename to testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-4-fennec64.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6m-cold-4.ini b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-4.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6m-cold-4.ini rename to testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-4.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6m-cold-5-fennec64.ini b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-5-fennec64.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6m-cold-5-fennec64.ini rename to testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-5-fennec64.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6m-cold-5.ini b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-5.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6m-cold-5.ini rename to testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-5.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6m-cold-6-fennec64.ini b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-6-fennec64.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6m-cold-6-fennec64.ini rename to testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-6-fennec64.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6m-cold-6.ini b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-6.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6m-cold-6.ini rename to testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-6.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6m-cold-7-fennec64.ini b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-7-fennec64.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6m-cold-7-fennec64.ini rename to testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-7-fennec64.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6m-cold-7.ini b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-7.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6m-cold-7.ini rename to testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-7.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6m-cold-8-fennec64.ini b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-8-fennec64.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6m-cold-8-fennec64.ini rename to testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-8-fennec64.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6m-cold-8.ini b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-8.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6m-cold-8.ini rename to testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-8.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6m-cold-9-fennec64.ini b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-9-fennec64.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6m-cold-9-fennec64.ini rename to testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-9-fennec64.ini diff --git a/testing/raptor/raptor/tests/raptor-tp6m-cold-9.ini b/testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-9.ini similarity index 100% rename from testing/raptor/raptor/tests/raptor-tp6m-cold-9.ini rename to testing/raptor/raptor/tests/tp6/mobile/raptor-tp6m-cold-9.ini