提交 57dfe4d2 编写于 作者: D Daniel Gustafsson

Remove unused string substitutions

The gpstringsubs program replaces tokens in input .source test files
when creating output .sql/.out files for pg_regress. There were no
more callsites for the gp_glob_connect token however so remove that,
and also remove tests for gpwhich_<binary> tokens which aren't in
use in tests and thus might start failing randomly, which is exactly
what happened in another patch where Perl programs were no longer
incorrectly installed in PATH. Without this, removing the Perl test
apps from PATH results in errors like this:

	which: no get_ereport.pl in ( .. )
Reviewed-by: NHeikki Linnakangas <hlinnakangas@pivotal.io>
上级 a42f430b
......@@ -72,11 +72,6 @@ The tokens are:
from the gp_configuration table and replaces all
instances of the token @hostname@.
=item gp_glob_connect
a compound psql connect string, equivalent to the "-connect" option
for this tool.
=item gpwhich_(executable)
Find the full path for the executable and substitute. For example,
......@@ -263,14 +258,13 @@ if (1)
my $hostexp = '\\@hostname\\@';
my $unexp = '\\@gpcurusername\\@';
my $gpglobconn = '\\@gp_glob_connect\\@';
my $gpwhich_all = `grep gpwhich_ $filnam`;
my $curdir = `pwd`;
chomp $curdir;
# print "$filnam\n";
system "perl -i -ple \' s/$hostexp/$hostname/gm; s/$unexp/$username/gm; s/$gpglobconn/$glob_connect/gm; s/$syslocaleexp/$syslocale/gm; \' $filnam\n";
system "perl -i -ple \' s/$hostexp/$hostname/gm; s/$unexp/$username/gm; s/$syslocaleexp/$syslocale/gm; \' $filnam\n";
# replace all "which" expressions with binary
if (defined($gpwhich_all) && length($gpwhich_all))
......
......@@ -6,13 +6,8 @@
-- DLSUFFIX #is_transformed_to# @DLSUFFIX@
-- hostname #is_transformed_to# @hostname@
-- syslocale #is_transformed_to# @syslocale@
-- gpwhich_gpfdist #is_transformed_to# @gpwhich_gpfdist@
-- gpwhich_curl #is_transformed_to# @gpwhich_curl@
-- gpwhich_gunzip #is_transformed_to# @gpwhich_gunzip@
-- gpwhich_gpmapreduce #is_transformed_to# @gpwhich_gpmapreduce@
-- gpwhich_get_ereport.pl #is_transformed_to# @gpwhich_get_ereport.pl@
-- gpcurusername #is_transformed_to# @gpcurusername@
-- gp_glob_connect #is_transformed_to# @gp_glob_connect@
--
--
-- end
......@@ -6,13 +6,8 @@
-- DLSUFFIX #is_transformed_to# @DLSUFFIX@
-- hostname #is_transformed_to# @hostname@
-- syslocale #is_transformed_to# @syslocale@
-- gpwhich_gpfdist #is_transformed_to# @gpwhich_gpfdist@
-- gpwhich_curl #is_transformed_to# @gpwhich_curl@
-- gpwhich_gunzip #is_transformed_to# @gpwhich_gunzip@
-- gpwhich_gpmapreduce #is_transformed_to# @gpwhich_gpmapreduce@
-- gpwhich_get_ereport.pl #is_transformed_to# @gpwhich_get_ereport.pl@
-- gpcurusername #is_transformed_to# @gpcurusername@
-- gp_glob_connect #is_transformed_to# @gp_glob_connect@
--
--
-- end
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册