postgrespro
diff --git a/‎src/interfaces/libpq/Makefile
Lines changed: 1 addition & 1 deletion b/‎src/interfaces/libpq/Makefile
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/interfaces/libpq/meson.build
Lines changed: 6 additions & 1 deletion b/‎src/interfaces/libpq/meson.build
Lines changed: 6 additions & 1 deletion
diff --git a/‎src/test/libpq_encryption/t/001_negotiate_encryption.pl renamed to ‎src/interfaces/libpq/t/005_negotiate_encryption.pl
Lines changed: 1 addition & 1 deletion b/‎src/test/libpq_encryption/t/001_negotiate_encryption.pl renamed to ‎src/interfaces/libpq/t/005_negotiate_encryption.pl
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/test/libpq_encryption/Makefile
Lines changed: 0 additions & 25 deletions b/‎src/test/libpq_encryption/Makefile
Lines changed: 0 additions & 25 deletions
diff --git a/‎src/test/libpq_encryption/README
Lines changed: 0 additions & 31 deletions b/‎src/test/libpq_encryption/README
Lines changed: 0 additions & 31 deletions
diff --git a/‎src/test/libpq_encryption/meson.build
Lines changed: 0 additions & 18 deletions b/‎src/test/libpq_encryption/meson.build
Lines changed: 0 additions & 18 deletions
diff --git a/‎src/test/meson.build
Lines changed: 0 additions & 1 deletion b/‎src/test/meson.build
Lines changed: 0 additions & 1 deletion
@@ -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"
 
 
@@ -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',
+    },
   },
 }
 
 
@@ -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: $!";
 
@@ -4,7 +4,6 @@ subdir('regress')
 subdir('isolation')
 
 subdir('authentication')
-subdir('libpq_encryption')
 subdir('recovery')
 subdir('subscription')
 subdir('modules')
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@`
`129`	`129`
`130`	`130`	`if ($ssl_supported != 0)`
`131`	`131`	`{`
`132`		`- my $certdir = dirname(__FILE__) . "/../../ssl/ssl";`
	`132`	`+ my $certdir = dirname(__FILE__) . "/../../../test/ssl/ssl";`
`133`	`133`
`134`	`134`	`copy "$certdir/server-cn-only.crt", "$pgdata/server.crt"`
`135`	`135`	`\|\| die "copying server.crt: $!";`