postgres.git / summary / log / commit / refs

commit    bfa4263e7119685cddb08ed2e2b3462157d4d453
Author:   Andrew Dunstan <andrew@dunslane.net>
Date:     Wed Jul 24 15:41:39 2019 +0000

    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.


 src/bin/pgbench/t/001_pgbench_with_server.pl | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/bin/pgbench/t/001_pgbench_with_server.pl b/src/bin/pgbench/t/001_pgbench_with_server.pl
index 3b097a91b28..85ad5ac14b8 100644
--- 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
 }


[parent: a15a40aaaedf]