From 46e1af45086f20555c22dae55386d5f2d2b77065 Mon Sep 17 00:00:00 2001 From: Emilio Pozuelo Monfort Date: Thu, 16 Mar 2023 11:50:28 +0100 Subject: [PATCH] Explicitly declare arrays Otherwise this fails to compile on buster on i386. Gbp-Pq: Topic porting Gbp-Pq: Name build-i386-mismatched-type-unsigned-long-int.patch --- .../telemetry/tests/gtest/TestCombinedStacks.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/toolkit/components/telemetry/tests/gtest/TestCombinedStacks.cpp b/toolkit/components/telemetry/tests/gtest/TestCombinedStacks.cpp index 3e21c7378c3..284f35bda14 100644 --- a/toolkit/components/telemetry/tests/gtest/TestCombinedStacks.cpp +++ b/toolkit/components/telemetry/tests/gtest/TestCombinedStacks.cpp @@ -86,11 +86,15 @@ TEST(CombinedStacks, Combine) // 01 +3000 // 02 modZ+2000 // 03 base+4000 + uintptr_t args1[] = {100, 200, 300}; + uintptr_t args2[] = {1000, 2000, 3000}; + uintptr_t args3[] = {100, 200, 300, 400}; + uintptr_t args4[] = {1000, 2000, 3000, 4000}; const ProcessedStack testStacks[] = { - MakeStack(moduleSet1, {100ul, 200ul, 300ul}), - MakeStack(moduleSet1, {1000ul, 2000ul, 3000ul}), - MakeStack(moduleSet2, {100ul, 200ul, 300ul, 400ul}), - MakeStack(moduleSet2, {1000ul, 2000ul, 3000ul, 4000ul}), + MakeStack(moduleSet1, args1), + MakeStack(moduleSet1, args2), + MakeStack(moduleSet2, args3), + MakeStack(moduleSet2, args4), }; // combined1 <-- testStacks[0] + testStacks[1] -- 2.30.2