From 02a898b00cd9f7175691b58fb567b51a53bdaad2 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Sat, 9 Jul 2016 16:47:39 -0400 Subject: Fix TAP tests and MSVC scripts for pathnames with spaces. Change assorted places in our Perl code that did things like system("prog $path/file"); to do it more like system('prog', "$path/file"); which is safe against spaces and other special characters in the path variable. The latter was already the prevailing style, but a few bits of code hadn't gotten this memo. Back-patch to 9.4 as relevant. Michael Paquier, Kyotaro Horiguchi Discussion: <20160704.160213.111134711.horiguchi.kyotaro@lab.ntt.co.jp> --- src/tools/msvc/vcregress.pl | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'src/tools/msvc/vcregress.pl') diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl index a5fbb55d2b4..e7a76a97b40 100644 --- a/src/tools/msvc/vcregress.pl +++ b/src/tools/msvc/vcregress.pl @@ -340,35 +340,41 @@ sub upgradecheck print "\nRunning initdb on old cluster\n\n"; standard_initdb() or exit 1; print "\nStarting old cluster\n\n"; - system("pg_ctl start -l $logdir/postmaster1.log -w") == 0 or exit 1; + my @args = ('pg_ctl', 'start', '-l', "$logdir/postmaster1.log", '-w'); + system(@args) == 0 or exit 1; print "\nSetting up data for upgrading\n\n"; installcheck(); # now we can chdir into the source dir chdir "$topdir/contrib/pg_upgrade"; print "\nDumping old cluster\n\n"; - system("pg_dumpall -f $tmp_root/dump1.sql") == 0 or exit 1; + @args = ('pg_dumpall', '-f', "$tmp_root/dump1.sql"); + system(@args) == 0 or exit 1; print "\nStopping old cluster\n\n"; system("pg_ctl -m fast stop") == 0 or exit 1; $ENV{PGDATA} = "$data"; print "\nSetting up new cluster\n\n"; standard_initdb() or exit 1; print "\nRunning pg_upgrade\n\n"; - system("pg_upgrade -d $data.old -D $data -b $bindir -B $bindir") == 0 - or exit 1; + @args = ('pg_upgrade', '-d', "$data.old", '-D', $data, '-b', $bindir, + '-B', $bindir); + system(@args) == 0 or exit 1; print "\nStarting new cluster\n\n"; - system("pg_ctl -l $logdir/postmaster2.log -w start") == 0 or exit 1; + @args = ('pg_ctl', '-l', "$logdir/postmaster2.log", '-w', 'start'); + system(@args) == 0 or exit 1; print "\nSetting up stats on new cluster\n\n"; system(".\\analyze_new_cluster.bat") == 0 or exit 1; print "\nDumping new cluster\n\n"; - system("pg_dumpall -f $tmp_root/dump2.sql") == 0 or exit 1; + @args = ('pg_dumpall', '-f', "$tmp_root/dump2.sql"); + system(@args) == 0 or exit 1; print "\nStopping new cluster\n\n"; system("pg_ctl -m fast stop") == 0 or exit 1; print "\nDeleting old cluster\n\n"; system(".\\delete_old_cluster.bat") == 0 or exit 1; print "\nComparing old and new cluster dumps\n\n"; - system("diff -q $tmp_root/dump1.sql $tmp_root/dump2.sql"); + @args = ('diff', '-q', "$tmp_root/dump1.sql", "$tmp_root/dump2.sql"); + system(@args); $status = $?; if (!$status) { -- cgit v1.2.3