Remove unnecesary comments and code in pgtde.pm

None of this is useful or used.
pull/220/head
Andreas Karlsson 5 months ago committed by Andreas Karlsson
parent 3b6d3d46dd
commit 1df4ff5110
  1. 21
      contrib/pg_tde/t/pgtde.pm

@ -4,11 +4,6 @@ use File::Basename;
use File::Compare; use File::Compare;
use Test::More; use Test::More;
our @ISA = qw(Exporter);
# These CAN be exported.
our @EXPORT = qw(pgtde_init_pg pgtde_start_pg pgtde_stop_pg pgtde_psql_cmd pgtde_setup_pg_tde pgtde_create_extension pgtde_drop_extension);
# Expected .out filename of TAP testcase being executed. These are already part of repo under t/expected/*. # Expected .out filename of TAP testcase being executed. These are already part of repo under t/expected/*.
our $expected_filename_with_path; our $expected_filename_with_path;
@ -22,7 +17,6 @@ our $out_filename_with_path;
our $debug_out_filename_with_path; our $debug_out_filename_with_path;
BEGIN { BEGIN {
# Get PG Server Major version from pg_config
$PG_MAJOR_VERSION = `pg_config --version | awk {'print \$2'} | cut -f1 -d"." | sed -e 's/[^0-9].*\$//g'`; $PG_MAJOR_VERSION = `pg_config --version | awk {'print \$2'} | cut -f1 -d"." | sed -e 's/[^0-9].*\$//g'`;
$PG_MAJOR_VERSION =~ s/^\s+|\s+$//g; $PG_MAJOR_VERSION =~ s/^\s+|\s+$//g;
@ -43,7 +37,7 @@ sub pgtde_init_pg
{ {
my $node; my $node;
print "Postgres major version: $PG_MAJOR_VERSION \n"; print "Postgres major version: $PG_MAJOR_VERSION\n";
# For Server version 15 & above, spawn the server using PostgreSQL::Test::Cluster # For Server version 15 & above, spawn the server using PostgreSQL::Test::Cluster
if ($PG_MAJOR_VERSION >= 15) { if ($PG_MAJOR_VERSION >= 15) {
@ -90,40 +84,30 @@ sub setup_files_dir
{ {
my ($perlfilename) = @_; my ($perlfilename) = @_;
# Expected folder where expected output will be present
my $expected_folder = "t/expected"; my $expected_folder = "t/expected";
# Results/out folder where generated results files will be placed
my $results_folder = "t/results"; my $results_folder = "t/results";
# Check if results folder exists or not, create if it doesn't
unless (-d $results_folder) unless (-d $results_folder)
{ {
mkdir $results_folder or die "Can't create folder $results_folder: $!\n"; mkdir $results_folder or die "Can't create folder $results_folder: $!\n";
} }
# Check if expected folder exists or not, bail out if it doesn't
unless (-d $expected_folder) unless (-d $expected_folder)
{ {
BAIL_OUT "Expected files folder $expected_folder doesn't exist: \n"; BAIL_OUT "Expected files folder $expected_folder doesn't exist: \n";
} }
#Remove .pl from filename and store in a variable
my @split_arr = split /\./, $perlfilename; my @split_arr = split /\./, $perlfilename;
my $filename_without_extension = $split_arr[0]; my $filename_without_extension = $split_arr[0];
# Create expected filename with path
my $expected_filename = "${filename_without_extension}.out"; my $expected_filename = "${filename_without_extension}.out";
$expected_filename_with_path = "${expected_folder}/${expected_filename}"; $expected_filename_with_path = "${expected_folder}/${expected_filename}";
# Create results filename with path
my $out_filename = "${filename_without_extension}.out"; my $out_filename = "${filename_without_extension}.out";
$out_filename_with_path = "${results_folder}/${out_filename}"; $out_filename_with_path = "${results_folder}/${out_filename}";
# Delete already existing result out file, if it exists. if (-f $out_filename_with_path)
if ( -f $out_filename_with_path)
{ {
unlink($out_filename_with_path) or die "Can't delete already existing $out_filename_with_path: $!\n"; unlink($out_filename_with_path) or die "Can't delete already existing $out_filename_with_path: $!\n";
} }
@ -133,7 +117,6 @@ sub setup_files_dir
sub compare_results sub compare_results
{ {
# Compare expected and results files and return the result
return compare($expected_filename_with_path, $out_filename_with_path); return compare($expected_filename_with_path, $out_filename_with_path);
} }

Loading…
Cancel
Save