Don't assume expr is available in pgbench tests

Windows hosts do not normally come with expr, so instead of using that
to test the \setshell command, use echo instead, which is fairly
universally available.

Backpatch to release 11, where this came in.

Problem found by me, patch by Fabien Coelho.

diff --git a/src/bin/pgbench/t/001_pgbench_with_server.pl b/src/bin/pgbench/t/001_pgbench_with_server.pl
index 3b097a91b28c44a81840710f777bbfc4522631a6..85ad5ac14b8d29628ac2fc21b1739a58e85327e5 100644 (file)
--- a/src/bin/pgbench/t/001_pgbench_with_server.pl
+++ b/src/bin/pgbench/t/001_pgbench_with_server.pl
@@ -510,7 +510,7 @@ pgbench(
                qr{processed: 1/1},
                qr{shell-echo-output}
        ],
-       [qr{command=8.: int 2\b}],
+       [qr{command=8.: int 1\b}],
        'pgbench backslash commands',
        {
                '001_pgbench_backslash_commands' => q{-- run set
@@ -522,10 +522,10 @@ pgbench(
 \sleep 0 s
 \sleep :zero
 -- setshell and continuation
-\setshell two\
-  expr \
-    1 + :one
-\set n debug(:two)
+\setshell another_one\
+  echo \
+    :one
+\set n debug(:another_one)
 -- shell
 \shell echo shell-echo-output
 }