From eebc08f6628b15e0e8cc1a84dec9bbbd9931696b Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Thu, 11 Aug 2022 08:57:58 -0700 Subject: [PATCH v2 1/3] Create test files for 010_tab_completion.pl in dedicated directory This is mainly motivated by the meson patchset, which wants to put the log / data for tests in a different place than the autoconf build. 010_tab_completion.pl is the only test hardcoding the tmp_check/ directory, thereby mandating that directory name. It's also a bit cleaner independently, because it doesn't intermingle the files with more important things like the log/ directory. --- src/bin/psql/t/010_tab_completion.pl | 33 ++++++++++++++-------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/src/bin/psql/t/010_tab_completion.pl b/src/bin/psql/t/010_tab_completion.pl index 2eea515e871..cb36e8e4811 100644 --- a/src/bin/psql/t/010_tab_completion.pl +++ b/src/bin/psql/t/010_tab_completion.pl @@ -68,7 +68,7 @@ delete $ENV{LS_COLORS}; # In a VPATH build, we'll be started in the source directory, but we want # to run in the build directory so that we can use relative paths to -# access the tmp_check subdirectory; otherwise the output from filename +# access the tab_comp_dir subdirectory; otherwise the output from filename # completion tests is too variable. if ($ENV{TESTDIR}) { @@ -76,17 +76,18 @@ if ($ENV{TESTDIR}) } # Create some junk files for filename completion testing. +mkdir "tab_comp_dir"; my $FH; -open $FH, ">", "tmp_check/somefile" - or die("could not create file \"tmp_check/somefile\": $!"); +open $FH, ">", "tab_comp_dir/somefile" + or die("could not create file \"tab_comp_dir/somefile\": $!"); print $FH "some stuff\n"; close $FH; -open $FH, ">", "tmp_check/afile123" - or die("could not create file \"tmp_check/afile123\": $!"); +open $FH, ">", "tab_comp_dir/afile123" + or die("could not create file \"tab_comp_dir/afile123\": $!"); print $FH "more stuff\n"; close $FH; -open $FH, ">", "tmp_check/afile456" - or die("could not create file \"tmp_check/afile456\": $!"); +open $FH, ">", "tab_comp_dir/afile456" + or die("could not create file \"tab_comp_dir/afile456\": $!"); print $FH "other stuff\n"; close $FH; @@ -272,16 +273,16 @@ clear_query(); # check filename completion check_completion( - "\\lo_import tmp_check/some\t", - qr|tmp_check/somefile |, + "\\lo_import tab_comp_dir/some\t", + qr|tab_comp_dir/somefile |, "filename completion with one possibility"); clear_query(); # note: readline might print a bell before the completion check_completion( - "\\lo_import tmp_check/af\t", - qr|tmp_check/af\a?ile|, + "\\lo_import tab_comp_dir/af\t", + qr|tab_comp_dir/af\a?ile|, "filename completion with multiple possibilities"); # broken versions of libedit require clear_line not clear_query here @@ -291,15 +292,15 @@ clear_line(); # note: broken versions of libedit want to backslash the closing quote; # not much we can do about that check_completion( - "COPY foo FROM tmp_check/some\t", - qr|'tmp_check/somefile\\?' |, + "COPY foo FROM tab_comp_dir/some\t", + qr|'tab_comp_dir/somefile\\?' |, "quoted filename completion with one possibility"); clear_line(); check_completion( - "COPY foo FROM tmp_check/af\t", - qr|'tmp_check/afile|, + "COPY foo FROM tab_comp_dir/af\t", + qr|'tab_comp_dir/afile|, "quoted filename completion with multiple possibilities"); # some versions of readline/libedit require two tabs here, some only need one @@ -307,7 +308,7 @@ check_completion( # the quotes might appear, too check_completion( "\t\t", - qr|afile123'? +'?(tmp_check/)?afile456|, + qr|afile123'? +'?(tab_comp_dir/)?afile456|, "offer multiple file choices"); clear_line(); -- 2.37.0.3.g30cc8d0f14