Move libpq encryption negotiation tests

The test targets libpq's options, so 'src/test/interfaces/libpq/t' is
a more natural place for it.

While doing this, I noticed that I had missed adding the
libpq_encryption subdir to the Makefile. That's why this commit only
needs to remove it from the meson.build file.

Per Peter Eisentraut's suggestion.

Discussion: https://www.postgresql.org/message-id/09d4bf5d-d0fa-4c66-a1d7-5ec757609646@eisentraut.org

Author: hlinnaka

src/interfaces/libpq/Makefile

@@ -13,7 +13,7 @@ subdir = src/interfaces/libpq
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-export with_ssl
+export with_ssl with_gssapi with_krb_srvnam
 
 PGFILEDESC = "PostgreSQL Access Library"
 

src/interfaces/libpq/meson.build

@@ -118,8 +118,13 @@ tests += {
       't/002_api.pl',
       't/003_load_balance_host_list.pl',
       't/004_load_balance_dns.pl',
+      't/005_negotiate_encryption.pl',
     ],
-    'env': {'with_ssl': ssl_library},
+    'env': {
+      'with_ssl': ssl_library,
+      'with_gssapi': gssapi.found() ? 'yes' : 'no',
+      'with_krb_srvnam': 'postgres',
+    },
   },
 }
 

src/test/libpq_encryption/t/001_negotiate_encryption.pl renamed to src/interfaces/libpq/t/005_negotiate_encryption.pl

@@ -129,7 +129,7 @@
 
 if ($ssl_supported != 0)
 {
-	my $certdir = dirname(__FILE__) . "/../../ssl/ssl";
+	my $certdir = dirname(__FILE__) . "/../../../test/ssl/ssl";
 
 	copy "$certdir/server-cn-only.crt", "$pgdata/server.crt"
 	  || die "copying server.crt: $!";

src/test/libpq_encryption/Makefile

@@ -4,7 +4,6 @@ subdir('regress')
 subdir('isolation')
 
 subdir('authentication')
-subdir('libpq_encryption')
 subdir('recovery')
 subdir('subscription')
 subdir('modules')