]> git.ipfire.org Git - thirdparty/glibc.git/commitdiff
benchtest: Correct shell script related to bench-malloc-thread
authorCupertino Miranda <cupertino.miranda@oracle.com>
Fri, 25 Apr 2025 14:38:25 +0000 (16:38 +0200)
committerFlorian Weimer <fweimer@redhat.com>
Fri, 25 Apr 2025 14:38:25 +0000 (16:38 +0200)
This patch changes the shell script that selects which arguments are used
for the execution of bench-malloc-thread.
The problem seems to have been introduced in commit:

  commit 2d6427a63cad8056ba6bcaaaa8df21977c8dde3d
  Author: Wangyang Guo <wangyang.guo@intel.com>
  Date:   Fri Nov 29 16:05:35 2024 +0800
  benchtests: Add calloc test

With current condition, the following error "/bin/sh: 3: [[: not found"
occurs when executing `make bench BENCHSET="malloc-thread"` and the else
path is taken, using incorrect arguments for bench test execution.

Error is reproducible in Debian based distros.

Reviewed-by: Florian Weimer <fweimer@redhat.com>
benchtests/Makefile

index cccee62eb0b042d90132c922ec635ce06789733d..74142da32651684f9d0d639c8f1ac5afdee53804 100644 (file)
@@ -493,7 +493,7 @@ bench-set: $(binaries-benchset)
 bench-malloc: $(binaries-bench-malloc)
        for run in $^; do \
          echo "$${run}"; \
-         if [[ `basename $${run}` =~ bench-[cm]alloc-thread ]]; then \
+         if basename $${run} | grep -q "bench-[cm]alloc-thread"; then \
                for thr in 1 8 16 32; do \
                        echo "Running $${run} $${thr}"; \
                        $(run-bench) $${thr} > $${run}-$${thr}.out; \