Fix: test_benchmark: do not match "CPU(s) scaling MHz:"

Do not match "CPU(s) scaling MHz:" line, it breaks the script.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: Ifa392d018590e098dae75acef2b8265c8714c4cb

diff --git a/src/lib/lttng-ust-fd/lttng-ust-fd.c b/src/lib/lttng-ust-fd/lttng-ust-fd.c
index 0360b6f269a85eca5db049bacf258492b7c97249..01decd1e0e2ef68444bb62dd452aabc92ee25548 100644 (file)
--- a/src/lib/lttng-ust-fd/lttng-ust-fd.c
+++ b/src/lib/lttng-ust-fd/lttng-ust-fd.c
@@ -148,6 +148,9 @@ int fclose(FILE *stream)
                        __lttng_ust_fd_plibc_fclose);
 }
 
+/* Old libc headers don't contain a close_range() declaration. */
+int close_range(unsigned int first, unsigned int last, int flags);
+
 /*
  * Override the libc close_range() symbol with our own, allowing
  * applications to close arbitrary file descriptors. If the fd is owned

diff --git a/tests/benchmark/test_benchmark b/tests/benchmark/test_benchmark
index 33e5ed49a3c9ae3299b4a3f0ad2e525be55e7e23..16d4a85546103a4baeedea6ce283a7e8dc40b90a 100755 (executable)
--- a/tests/benchmark/test_benchmark
+++ b/tests/benchmark/test_benchmark
@@ -13,7 +13,7 @@ plan_tests 1
 : ${ITERS:=10}
 : ${DURATION:=2}
 : ${NR_THREADS:=1}
-: ${NR_CPUS:=$(lscpu | grep "^CPU(s)" | sed 's/^.*:[ \t]*//g')}
+: ${NR_CPUS:=$(lscpu | grep "^CPU(s):" | sed 's/^.*:[ \t]*//g')}
 
 : ${TIME:="./$CURDIR/ptime"}