threads / patch / 63310

patcht/meson.build: remove deleted performance test script

Subject: [PATCH] t/meson.build: remove deleted performance test script

## tl;dr

4 messages between Apr 18, 2025 and Apr 18, 2025. Diffs are folded; open one to read it.

replies: 3people: 2as markdown or json

Ramsay Jones· Apr 18, 2025, 16:59 UTC · lore

Commit 8b0b5c7046 (p5312: removed duplicate performance test script, 2025-04-17) removed the 't/perf/p5312-pack-bitmaps-revs.sh' script, but forgot to remove it from 't/meson.build', resulting in a broken build.

In order to fix the build, remove the script from 't/meson.build'.

Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
---

Hi Taylor, Junio,

If you need to re-roll the 'tb/pack-bitmap-lookup-tables' branch, could you please squash this into commit 8b0b5c7046. (the meson build on the current 'seen' branch is broken otherwise).

Thanks!

ATB,
Ramsay Jones
 
 t/meson.build | 1 -
 1 file changed, 1 deletion(-)

Show changes to t/meson.build +0 −1

diff --git a/t/meson.build b/t/meson.build
index 6eeb10d616..97e6d62228 100644
--- a/t/meson.build
+++ b/t/meson.build
@@ -1132,7 +1132,6 @@ benchmarks = [
   'perf/p5304-prune.sh',
   'perf/p5310-pack-bitmaps.sh',
   'perf/p5311-pack-bitmaps-fetch.sh',
-  'perf/p5312-pack-bitmaps-revs.sh',
   'perf/p5313-pack-objects.sh',
   'perf/p5314-name-hash.sh',
   'perf/p5326-multi-pack-bitmaps.sh',

-- 
2.49.0

Junio C Hamano· Apr 18, 2025, 17:40 UTC · re: Ramsay Jones · lore

Re: [PATCH] t/meson.build: remove deleted performance test script

Ramsay Jones <ramsay@ramsayjones.plus.com> writes:

Show 5 quoted lines

> Commit 8b0b5c7046 (p5312: removed duplicate performance test script,
> 2025-04-17) removed the 't/perf/p5312-pack-bitmaps-revs.sh' script, but
> forgot to remove it from 't/meson.build', resulting in a broken build.
>
> In order to fix the build, remove the script from 't/meson.build'.

Thanks.

Show 8 quoted lines

> Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
> ---
>
> Hi Taylor, Junio,
>
> If you need to re-roll the 'tb/pack-bitmap-lookup-tables' branch, could
> you please squash this into commit 8b0b5c7046. (the meson build on the
> current 'seen' branch is broken otherwise).

Unless the topic by Tayor gets rebased on top of what contains ps/meson-build-perf-bench, which is not even in 'next' (hence I wouldn't recommend doing such a rebase), this needs to be dealt with as an evil-merge semantic conflict fix-up, which I did this morning and pushed the result out.

Ramsay Jones· Apr 18, 2025, 18:52 UTC · re: Junio C Hamano · lore

Re: [PATCH] t/meson.build: remove deleted performance test script

On 18/04/2025 18:40, Junio C Hamano wrote:

Show 25 quoted lines

> Ramsay Jones <ramsay@ramsayjones.plus.com> writes:
> 
>> Commit 8b0b5c7046 (p5312: removed duplicate performance test script,
>> 2025-04-17) removed the 't/perf/p5312-pack-bitmaps-revs.sh' script, but
>> forgot to remove it from 't/meson.build', resulting in a broken build.
>>
>> In order to fix the build, remove the script from 't/meson.build'.
> 
> Thanks.
> 
> 
>> Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
>> ---
>>
>> Hi Taylor, Junio,
>>
>> If you need to re-roll the 'tb/pack-bitmap-lookup-tables' branch, could
>> you please squash this into commit 8b0b5c7046. (the meson build on the
>> current 'seen' branch is broken otherwise).
> 
> Unless the topic by Tayor gets rebased on top of what contains
> ps/meson-build-perf-bench, which is not even in 'next' (hence I
> wouldn't recommend doing such a rebase), this needs to be dealt with
> as an evil-merge semantic conflict fix-up, which I did this morning
> and pushed the result out.

Ah, yes, I just fetched and found your fixup (which you did hours ago!). Sorry for the noise.

Thanks.

ATB, Ramsay Jones

Junio C Hamano· Apr 18, 2025, 19:51 UTC · re: Ramsay Jones · lore

Re: [PATCH] t/meson.build: remove deleted performance test script

Ramsay Jones <ramsay@ramsayjones.plus.com> writes:

Show 12 quoted lines

>>> If you need to re-roll the 'tb/pack-bitmap-lookup-tables' branch, could
>>> you please squash this into commit 8b0b5c7046. (the meson build on the
>>> current 'seen' branch is broken otherwise).
>> 
>> Unless the topic by Tayor gets rebased on top of what contains
>> ps/meson-build-perf-bench, which is not even in 'next' (hence I
>> wouldn't recommend doing such a rebase), this needs to be dealt with
>> as an evil-merge semantic conflict fix-up, which I did this morning
>> and pushed the result out.
>
> Ah, yes, I just fetched and found your fixup (which you did hours ago!).
> Sorry for the noise.

I very much appreciate your being on the lookout for any breakages. Thanks.