Tests: Add Candy Crush Soda Saga trace
Test: angle_perftests --gtest_filter="*candy_crush_soda_saga*"
Tbr: jmadill@google.com,timvp@google.com
Bug: b/186362192
Change-Id: I9a1f9663541e3b97d437a1803e8fe079a5dbd2b8
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2846187
Reviewed-by: Cody Northrop <cnorthrop@google.com>
Commit-Queue: Cody Northrop <cnorthrop@google.com>
diff --git a/DEPS b/DEPS
index 8ec7463..2a5c668 100644
--- a/DEPS
+++ b/DEPS
@@ -722,6 +722,16 @@
'dep_type': 'cipd',
'condition': 'checkout_angle_restricted_traces',
},
+ 'src/tests/restricted_traces/candy_crush_soda_saga': {
+ 'packages': [
+ {
+ 'package': 'angle/traces/candy_crush_soda_saga',
+ 'version': 'version:1',
+ },
+ ],
+ 'dep_type': 'cipd',
+ 'condition': 'checkout_angle_restricted_traces',
+ },
'src/tests/restricted_traces/car_parking_multiplayer': {
'packages': [
{
diff --git a/scripts/code_generation_hashes/restricted_traces.json b/scripts/code_generation_hashes/restricted_traces.json
index e799075..6d90dd8 100644
--- a/scripts/code_generation_hashes/restricted_traces.json
+++ b/scripts/code_generation_hashes/restricted_traces.json
@@ -1,14 +1,14 @@
{
"src/tests/restricted_traces/.gitignore":
- "65264f0949b0f3aa6b8e3523c3bf7d55",
+ "fa4b9593b1881cd860f3a9e59c83406f",
"src/tests/restricted_traces/gen_restricted_traces.py":
"f700505c2ba8299a6ce68962763d7f2d",
"src/tests/restricted_traces/restricted_traces.json":
- "f3261d68ce50ceebaf3e709d7c1530bf",
+ "6546c6209cd27a7337b6ea4501e96852",
"src/tests/restricted_traces/restricted_traces_autogen.cpp":
- "3d5b3fb01c2291817905cae48f39c6f4",
+ "f5485a3df343e1e470d250b6de303cfe",
"src/tests/restricted_traces/restricted_traces_autogen.gni":
- "e3640934f7a39c989f4fda63165cd1b9",
+ "13f5149cee13dfe77ff536fd75ccfd09",
"src/tests/restricted_traces/restricted_traces_autogen.h":
- "8ba284e6f864ceb0792e23a2f5723f44"
+ "7bffa7fdb2513509f3ed28b5360d0923"
}
\ No newline at end of file
diff --git a/src/tests/restricted_traces/.gitignore b/src/tests/restricted_traces/.gitignore
index ac65a34..a02254d 100644
--- a/src/tests/restricted_traces/.gitignore
+++ b/src/tests/restricted_traces/.gitignore
@@ -10,6 +10,7 @@
bus_simulator_indonesia/
call_break_offline_card_game/
candy_crush_500/
+candy_crush_soda_saga/
car_parking_multiplayer/
clash_of_clans/
clash_royale/
diff --git a/src/tests/restricted_traces/restricted_traces.json b/src/tests/restricted_traces/restricted_traces.json
index 2b95e78..1f8c337 100644
--- a/src/tests/restricted_traces/restricted_traces.json
+++ b/src/tests/restricted_traces/restricted_traces.json
@@ -20,6 +20,7 @@
"bus_simulator_indonesia 1",
"call_break_offline_card_game 1",
"candy_crush_500 1",
+ "candy_crush_soda_saga 1",
"car_parking_multiplayer 1",
"clash_of_clans 1",
"clash_royale 1",
diff --git a/src/tests/restricted_traces/restricted_traces_autogen.cpp b/src/tests/restricted_traces/restricted_traces_autogen.cpp
index 4c5c1b7..d7ea6ba 100644
--- a/src/tests/restricted_traces/restricted_traces_autogen.cpp
+++ b/src/tests/restricted_traces/restricted_traces_autogen.cpp
@@ -24,6 +24,7 @@
#include "bus_simulator_indonesia/bus_simulator_indonesia_capture_context1.h"
#include "call_break_offline_card_game/call_break_offline_card_game_capture_context2.h"
#include "candy_crush_500/candy_crush_500_capture_context1.h"
+#include "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2.h"
#include "car_parking_multiplayer/car_parking_multiplayer_capture_context1.h"
#include "clash_of_clans/clash_of_clans_capture_context1.h"
#include "clash_royale/clash_royale_capture_context1.h"
@@ -155,6 +156,12 @@
candy_crush_500::kReplayContextClientMinorVersion, candy_crush_500::kReplayFrameStart,
candy_crush_500::kReplayFrameEnd, candy_crush_500::kReplayDrawSurfaceWidth,
candy_crush_500::kReplayDrawSurfaceHeight, "candy_crush_500"}},
+ {RestrictedTraceID::candy_crush_soda_saga,
+ {candy_crush_soda_saga::kReplayContextClientMajorVersion,
+ candy_crush_soda_saga::kReplayContextClientMinorVersion,
+ candy_crush_soda_saga::kReplayFrameStart, candy_crush_soda_saga::kReplayFrameEnd,
+ candy_crush_soda_saga::kReplayDrawSurfaceWidth,
+ candy_crush_soda_saga::kReplayDrawSurfaceHeight, "candy_crush_soda_saga"}},
{RestrictedTraceID::car_parking_multiplayer,
{car_parking_multiplayer::kReplayContextClientMajorVersion,
car_parking_multiplayer::kReplayContextClientMinorVersion,
diff --git a/src/tests/restricted_traces/restricted_traces_autogen.gni b/src/tests/restricted_traces/restricted_traces_autogen.gni
index 130705d..5a8ef6f 100644
--- a/src/tests/restricted_traces/restricted_traces_autogen.gni
+++ b/src/tests/restricted_traces/restricted_traces_autogen.gni
@@ -384,6 +384,112 @@
],
],
[
+ "candy_crush_soda_saga",
+ 2,
+ [
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame001.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame002.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame003.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame004.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame005.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame006.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame007.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame008.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame009.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame010.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame011.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame012.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame013.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame014.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame015.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame016.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame017.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame018.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame019.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame020.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame021.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame022.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame023.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame024.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame025.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame026.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame027.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame028.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame029.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame030.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame031.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame032.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame033.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame034.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame035.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame036.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame037.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame038.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame039.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame040.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame041.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame042.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame043.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame044.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame045.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame046.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame047.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame048.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame049.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame050.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame051.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame052.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame053.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame054.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame055.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame056.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame057.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame058.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame059.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame060.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame061.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame062.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame063.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame064.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame065.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame066.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame067.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame068.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame069.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame070.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame071.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame072.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame073.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame074.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame075.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame076.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame077.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame078.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame079.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame080.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame081.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame082.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame083.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame084.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame085.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame086.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame087.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame088.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame089.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame090.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame091.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame092.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame093.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame094.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame095.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame096.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame097.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame098.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame099.cpp",
+ "candy_crush_soda_saga/candy_crush_soda_saga_capture_context2_frame100.cpp",
+ ],
+ ],
+ [
"car_parking_multiplayer",
1,
[
diff --git a/src/tests/restricted_traces/restricted_traces_autogen.h b/src/tests/restricted_traces/restricted_traces_autogen.h
index f0a70a5..5d66440 100644
--- a/src/tests/restricted_traces/restricted_traces_autogen.h
+++ b/src/tests/restricted_traces/restricted_traces_autogen.h
@@ -66,6 +66,7 @@
bus_simulator_indonesia,
call_break_offline_card_game,
candy_crush_500,
+ candy_crush_soda_saga,
car_parking_multiplayer,
clash_of_clans,
clash_royale,
