From 836e6221df89f996887a1fa6bcdf21d31c2e4a52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janek=20G=C3=B3ral?= Date: Thu, 8 Apr 2021 13:35:00 +0200 Subject: [PATCH] fix configs --- .../fixtures/benchmark/3dmark-NexusLowRes.yml | 1 - .../benchmark/3dmark-NexusLowResEmulator.yml | 1 - .../ftl/fixtures/benchmark/3dmark-all.yml | 24 +++++++++++++++++++ .../ftl/fixtures/benchmark/3dmark-redfin.yml | 1 - .../benchmark/geekbench-NexusLowRes.yml | 1 - .../geekbench-NexusLowResEmulator.yml | 1 - .../ftl/fixtures/benchmark/geekbench-all.yml | 1 - .../fixtures/benchmark/geekbench-redfin.yml | 1 - 8 files changed, 24 insertions(+), 7 deletions(-) create mode 100644 test_runner/src/test/kotlin/ftl/fixtures/benchmark/3dmark-all.yml diff --git a/test_runner/src/test/kotlin/ftl/fixtures/benchmark/3dmark-NexusLowRes.yml b/test_runner/src/test/kotlin/ftl/fixtures/benchmark/3dmark-NexusLowRes.yml index 2ba0e9702c..f307031531 100644 --- a/test_runner/src/test/kotlin/ftl/fixtures/benchmark/3dmark-NexusLowRes.yml +++ b/test_runner/src/test/kotlin/ftl/fixtures/benchmark/3dmark-NexusLowRes.yml @@ -12,6 +12,5 @@ gcloud: locale: en orientation: portrait record-video: true -flank: test-targets: - "class com.example.test.benchmark.Run3dMark" diff --git a/test_runner/src/test/kotlin/ftl/fixtures/benchmark/3dmark-NexusLowResEmulator.yml b/test_runner/src/test/kotlin/ftl/fixtures/benchmark/3dmark-NexusLowResEmulator.yml index d7ec2fba40..1459c7ac80 100644 --- a/test_runner/src/test/kotlin/ftl/fixtures/benchmark/3dmark-NexusLowResEmulator.yml +++ b/test_runner/src/test/kotlin/ftl/fixtures/benchmark/3dmark-NexusLowResEmulator.yml @@ -12,6 +12,5 @@ gcloud: locale: en orientation: portrait record-video: true -flank: test-targets: - "class com.example.test.benchmark.Run3dMark" diff --git a/test_runner/src/test/kotlin/ftl/fixtures/benchmark/3dmark-all.yml b/test_runner/src/test/kotlin/ftl/fixtures/benchmark/3dmark-all.yml new file mode 100644 index 0000000000..9b357fd25c --- /dev/null +++ b/test_runner/src/test/kotlin/ftl/fixtures/benchmark/3dmark-all.yml @@ -0,0 +1,24 @@ +gcloud: + app: "./src/test/kotlin/ftl/fixtures/tmp/apk/app-debug.apk" + test: "./src/test/kotlin/ftl/fixtures/tmp/apk/benchmark/benchmark-debug-androidTest.apk" + use-orchestrator: false + directories-to-pull: + - "/sdcard/Android/data/com.futuremark.dmandroid.application/files/3DMarkAndroid/" + additional-apks: + - "./src/test/kotlin/ftl/fixtures/tmp/apk/benchmark/3dmarkandroid-v2-1-4726.apk" + device: + - model: NexusLowRes + version: 30 + locale: en + orientation: portrait + - model: NexusLowResEmulator + version: 30 + locale: en + orientation: portrait + - model: redfin + version: 30 + locale: en + orientation: portrait + record-video: true + test-targets: + - "class com.example.test.benchmark.Run3dMark" diff --git a/test_runner/src/test/kotlin/ftl/fixtures/benchmark/3dmark-redfin.yml b/test_runner/src/test/kotlin/ftl/fixtures/benchmark/3dmark-redfin.yml index 256202714e..ca226eb396 100644 --- a/test_runner/src/test/kotlin/ftl/fixtures/benchmark/3dmark-redfin.yml +++ b/test_runner/src/test/kotlin/ftl/fixtures/benchmark/3dmark-redfin.yml @@ -12,6 +12,5 @@ gcloud: locale: en orientation: portrait record-video: true -flank: test-targets: - "class com.example.test.benchmark.Run3dMark" diff --git a/test_runner/src/test/kotlin/ftl/fixtures/benchmark/geekbench-NexusLowRes.yml b/test_runner/src/test/kotlin/ftl/fixtures/benchmark/geekbench-NexusLowRes.yml index 05872f836d..203222fed9 100644 --- a/test_runner/src/test/kotlin/ftl/fixtures/benchmark/geekbench-NexusLowRes.yml +++ b/test_runner/src/test/kotlin/ftl/fixtures/benchmark/geekbench-NexusLowRes.yml @@ -12,6 +12,5 @@ gcloud: locale: en orientation: portrait record-video: true -flank: test-targets: - "class com.example.test.benchmark.RunGeekbench" diff --git a/test_runner/src/test/kotlin/ftl/fixtures/benchmark/geekbench-NexusLowResEmulator.yml b/test_runner/src/test/kotlin/ftl/fixtures/benchmark/geekbench-NexusLowResEmulator.yml index d54fa223e4..fea5c2cb92 100644 --- a/test_runner/src/test/kotlin/ftl/fixtures/benchmark/geekbench-NexusLowResEmulator.yml +++ b/test_runner/src/test/kotlin/ftl/fixtures/benchmark/geekbench-NexusLowResEmulator.yml @@ -12,6 +12,5 @@ gcloud: locale: en orientation: portrait record-video: true -flank: test-targets: - "class com.example.test.benchmark.RunGeekbench" diff --git a/test_runner/src/test/kotlin/ftl/fixtures/benchmark/geekbench-all.yml b/test_runner/src/test/kotlin/ftl/fixtures/benchmark/geekbench-all.yml index 4be435c33b..013c994051 100644 --- a/test_runner/src/test/kotlin/ftl/fixtures/benchmark/geekbench-all.yml +++ b/test_runner/src/test/kotlin/ftl/fixtures/benchmark/geekbench-all.yml @@ -20,6 +20,5 @@ gcloud: locale: en orientation: portrait record-video: true -flank: test-targets: - "class com.example.test.benchmark.RunGeekbench" diff --git a/test_runner/src/test/kotlin/ftl/fixtures/benchmark/geekbench-redfin.yml b/test_runner/src/test/kotlin/ftl/fixtures/benchmark/geekbench-redfin.yml index e8f7a75337..6cfd916346 100644 --- a/test_runner/src/test/kotlin/ftl/fixtures/benchmark/geekbench-redfin.yml +++ b/test_runner/src/test/kotlin/ftl/fixtures/benchmark/geekbench-redfin.yml @@ -12,6 +12,5 @@ gcloud: locale: en orientation: portrait record-video: true -flank: test-targets: - "class com.example.test.benchmark.RunGeekbench"