From: Nick Alcock Date: Thu, 15 May 2025 14:45:10 +0000 (+0100) Subject: libctf: testsuite fixes for datasec size changes X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4bdc7aed0373a384f0526db3f7da11efd08d7bf7;p=thirdparty%2Fbinutils-gdb.git libctf: testsuite fixes for datasec size changes --- diff --git a/libctf/testsuite/libctf-lookup/by-kind/array.lk b/libctf/testsuite/libctf-lookup/by-kind/array.lk index 2f9334d3295..e33c10142a7 100644 --- a/libctf/testsuite/libctf-lookup/by-kind/array.lk +++ b/libctf/testsuite/libctf-lookup/by-kind/array.lk @@ -4,7 +4,7 @@ #... Section \.bss: - 0: 0x4: foo: 0x3: \(kind 3\) int \[16\] .* + 0: 0x4: foo \(datasec size: .*\): 0x3: \(kind 3\) int \[16\] .* Types: diff --git a/libctf/testsuite/libctf-lookup/by-kind/const.lk b/libctf/testsuite/libctf-lookup/by-kind/const.lk index 31910539138..c895abbc46f 100644 --- a/libctf/testsuite/libctf-lookup/by-kind/const.lk +++ b/libctf/testsuite/libctf-lookup/by-kind/const.lk @@ -4,7 +4,7 @@ #... Section \.rodata: - 0: 0x3: foo: 0x2: \(kind 10\) const int .* + 0: 0x3: foo \(datasec size: .*\): 0x2: \(kind 10\) const int .* Types: diff --git a/libctf/testsuite/libctf-lookup/by-kind/datasec.lk b/libctf/testsuite/libctf-lookup/by-kind/datasec.lk index 0e3ed471488..f5a657cf489 100644 --- a/libctf/testsuite/libctf-lookup/by-kind/datasec.lk +++ b/libctf/testsuite/libctf-lookup/by-kind/datasec.lk @@ -4,7 +4,7 @@ #... Section \.BAR: - 0: 0x2: foo: 0x1: \(kind 1\) int .* + 0: 0x2: foo \(datasec size: .*\): 0x1: \(kind 1\) int .* Types: diff --git a/libctf/testsuite/libctf-lookup/by-kind/decl-tag.lk b/libctf/testsuite/libctf-lookup/by-kind/decl-tag.lk index 18c430a47d1..7a150fd88c1 100644 --- a/libctf/testsuite/libctf-lookup/by-kind/decl-tag.lk +++ b/libctf/testsuite/libctf-lookup/by-kind/decl-tag.lk @@ -4,8 +4,8 @@ #... Section \.bss: - 0: 0x[45]: bar: 0x2: \(kind 4\) struct .* - 0: 0x[56]: foo: 0x1: \(kind 1\) int .* + 0: 0x[45]: bar \(datasec size: .*\): 0x2: \(kind 4\) struct .* + 0: 0x[56]: foo \(datasec size: .*\): 0x1: \(kind 1\) int .* Types: diff --git a/libctf/testsuite/libctf-lookup/by-kind/enum.lk b/libctf/testsuite/libctf-lookup/by-kind/enum.lk index f06d8cddeff..875f09a1e1c 100644 --- a/libctf/testsuite/libctf-lookup/by-kind/enum.lk +++ b/libctf/testsuite/libctf-lookup/by-kind/enum.lk @@ -4,8 +4,8 @@ #... Section \.bss: - [0-9]*: 0x[0-9]*: bar: 0x3: \(kind 19\) enum big .* - [0-9]*: 0x[0-9]*: foo: 0x1: \(kind 6\) enum baz .* + [0-9]*: 0x[0-9]*: bar \(datasec size: .*\): 0x3: \(kind 19\) enum big .* + [0-9]*: 0x[0-9]*: foo \(datasec size: .*\): 0x1: \(kind 6\) enum baz .* Types: diff --git a/libctf/testsuite/libctf-lookup/by-kind/forward.lk b/libctf/testsuite/libctf-lookup/by-kind/forward.lk index aad478ba333..e5b78c2aef2 100644 --- a/libctf/testsuite/libctf-lookup/by-kind/forward.lk +++ b/libctf/testsuite/libctf-lookup/by-kind/forward.lk @@ -4,7 +4,7 @@ #... Section \.bss: - 0: 0x3: bar: 0x2: \(kind 2\) struct foo \* .* -> 0x1: \(kind 7\) struct foo + 0: 0x3: bar \(datasec size: .*\): 0x2: \(kind 2\) struct foo \* .* -> 0x1: \(kind 7\) struct foo Types: diff --git a/libctf/testsuite/libctf-lookup/by-kind/integer.lk b/libctf/testsuite/libctf-lookup/by-kind/integer.lk index 9c99b273acd..a7cef361ef3 100644 --- a/libctf/testsuite/libctf-lookup/by-kind/integer.lk +++ b/libctf/testsuite/libctf-lookup/by-kind/integer.lk @@ -4,7 +4,7 @@ #... Section \.bss: - 0: 0x2: foo: 0x1: \(kind 1\) int .* + 0: 0x2: foo \(datasec size: .*\): 0x1: \(kind 1\) int .* Types: diff --git a/libctf/testsuite/libctf-lookup/by-kind/pointer.lk b/libctf/testsuite/libctf-lookup/by-kind/pointer.lk index d551902c9d9..f399d0bdc3e 100644 --- a/libctf/testsuite/libctf-lookup/by-kind/pointer.lk +++ b/libctf/testsuite/libctf-lookup/by-kind/pointer.lk @@ -4,7 +4,7 @@ #... Section \.bss: - 0: 0x3: foo: 0x2: \(kind 2\) int \* .* + 0: 0x3: foo \(datasec size: .*\): 0x2: \(kind 2\) int \* .* Types: diff --git a/libctf/testsuite/libctf-lookup/by-kind/restrict.lk b/libctf/testsuite/libctf-lookup/by-kind/restrict.lk index 5a6ad195158..26254dbc59f 100644 --- a/libctf/testsuite/libctf-lookup/by-kind/restrict.lk +++ b/libctf/testsuite/libctf-lookup/by-kind/restrict.lk @@ -4,7 +4,7 @@ #... Section \.bss: - 0: 0x4: foo: 0x3: \(kind 11\) int \*restrict .* + 0: 0x4: foo \(datasec size: .*\): 0x3: \(kind 11\) int \*restrict .* Types: diff --git a/libctf/testsuite/libctf-lookup/by-kind/struct.lk b/libctf/testsuite/libctf-lookup/by-kind/struct.lk index 879a8afb582..7552549ea02 100644 --- a/libctf/testsuite/libctf-lookup/by-kind/struct.lk +++ b/libctf/testsuite/libctf-lookup/by-kind/struct.lk @@ -4,7 +4,7 @@ #... Section \.bss: - 0: 0x3: foo: 0x1: \(kind 4\) struct .* + 0: 0x3: foo \(datasec size: .*\): 0x1: \(kind 4\) struct .* Types: diff --git a/libctf/testsuite/libctf-lookup/by-kind/type-tag.lk b/libctf/testsuite/libctf-lookup/by-kind/type-tag.lk index a7647b0b388..183760583c7 100644 --- a/libctf/testsuite/libctf-lookup/by-kind/type-tag.lk +++ b/libctf/testsuite/libctf-lookup/by-kind/type-tag.lk @@ -4,7 +4,7 @@ #... Section \.bss: - 0: 0x[23]: foo: 0x[234]: \(kind 18\) ttag .* -> 0x1: \(kind 1\) int .* + 0: 0x[23]: foo \(datasec size: .*\): 0x[234]: \(kind 18\) ttag .* -> 0x1: \(kind 1\) int .* Types: diff --git a/libctf/testsuite/libctf-lookup/by-kind/union.lk b/libctf/testsuite/libctf-lookup/by-kind/union.lk index 4092fca17ae..8f8887f8d1c 100644 --- a/libctf/testsuite/libctf-lookup/by-kind/union.lk +++ b/libctf/testsuite/libctf-lookup/by-kind/union.lk @@ -4,7 +4,7 @@ #... Section \.bss: - 0: 0x3: foo: 0x1: \(kind 5\) union bar .* + 0: 0x3: foo \(datasec size: .*\): 0x1: \(kind 5\) union bar .* Types: diff --git a/libctf/testsuite/libctf-lookup/by-kind/volatile.lk b/libctf/testsuite/libctf-lookup/by-kind/volatile.lk index 65b533e98d5..3f422746044 100644 --- a/libctf/testsuite/libctf-lookup/by-kind/volatile.lk +++ b/libctf/testsuite/libctf-lookup/by-kind/volatile.lk @@ -4,7 +4,7 @@ #... Section \.bss: - 0: 0x3: foo: 0x2: \(kind 9\) volatile int .* + 0: 0x3: foo \(datasec size: .*\): 0x2: \(kind 9\) volatile int .* Types: