Merge pull request #115

Fix propagation and logic for Makefile.PL --testhost and --testport

Author: pali

Makefile.PL

@@ -37,16 +37,16 @@ $test_socket = $::test_socket;
 Getopt::Long::GetOptions(
     $opt,
     "help",
-    "testdb=s",
-    "testhost=s",
-    "testport=s",
-    "testuser=s",
-    "testpassword=s",
-    "testsocket=s",
-    "cflags=s",
-    "libs=s",
-    "mysql_config=s",
-    "mariadb_config=s",
+    "testdb:s",
+    "testhost:s",
+    "testport:s",
+    "testuser:s",
+    "testpassword:s",
+    "testsocket:s",
+    "cflags:s",
+    "libs:s",
+    "mysql_config:s",
+    "mariadb_config:s",
     ) || die Usage();
 
 $opt->{mysql_config} = delete $opt->{mariadb_config} if exists $opt->{mariadb_config};
@@ -103,24 +103,25 @@ for my $key (qw(testdb testhost testuser testpassword testsocket testport cflags
   Configure($opt, $source, $key);
 }
 
-if (!$opt->{testport} && (!$opt->{testhost} || $opt->{testhost} eq 'localhost') && !$opt->{testsocket} && $test_socket) {
+if (!$opt->{testport} && (!$opt->{testhost} || $opt->{testhost} eq 'localhost') && !defined $opt->{testsocket} && $test_socket) {
   $opt->{testsocket} = $test_socket;
   $source->{testsocket} = "User's choice";
-  if ($test_host && $test_host eq 'localhost') {
-    $opt->{testhost} = 'localhost';
-    $source->{testhost} = "User's choice";
-  }
 }
 
 if (!$opt->{testsocket}) {
-  if (!$opt->{testhost} && $test_host) {
+  if (!defined $opt->{testhost} && $test_host && (!$opt->{testport} || $test_host ne 'localhost')) {
     $opt->{testhost} = $test_host;
     $source->{testhost} = "User's choice";
   }
-  if (!$opt->{testport} && $test_port) {
+  if (!defined $opt->{testport} && $test_port && (!$opt->{testhost} || $opt->{testhost} ne 'localhost')) {
     $opt->{testport} = $test_port;
     $source->{testport} = "User's choice";
   }
+} else {
+  if (!defined $opt->{testhost} && $test_host && $test_host eq 'localhost') {
+    $opt->{testhost} = 'localhost';
+    $source->{testhost} = "User's choice";
+  }
 }
 
 #if we have a testport but no host, assume 127.0.0.1
@@ -129,13 +130,33 @@ if ( $opt->{testport} && !$opt->{testhost} ) {
   $source->{testhost} = 'guessed';
 }
 
+foreach (qw(testhost testport testsocket)) {
+  next if defined $opt->{$_};
+  $opt->{$_} = '';
+  $source->{$_} = 'default';
+}
+
 # testsocket makes sense only when testhost is localhost
 if ($opt->{testsocket} && $opt->{testhost} && $opt->{testhost} ne 'localhost') {
   die << "MSG";
 Option --testport or --testhost different from localhost cannot be specified together with option --testsocket.
 MSG
 }
 
+# testport cannot be specified when host is localhost
+if ($opt->{testport} && $opt->{testhost} && $opt->{testhost} eq 'localhost') {
+  die << "MSG";
+Option --testport cannot be specified when --testhost is localhost.
+MSG
+}
+
+# testhost cannot be embedded
+if ($opt->{testhost} && $opt->{testhost} eq 'embedded') {
+  die << "MSG";
+Option --testhost cannot be embedded.
+MSG
+}
+
 # Separate libs and libdirs from ldflags
 # When linking libdirs must be specified before libs due to runtime linking problems
 my ($main_lib, @libs, @libdirs, @ldflags);
@@ -524,7 +545,7 @@ sub ParseMySQLConfig {
 
 sub Configure {
     my($opt, $source, $param) = @_;
-    if (defined($opt->{$param}) and length($opt->{$param})) {
+    if (defined($opt->{$param})) {
         $source->{$param} = "User's choice";
         return;
     }
@@ -643,8 +664,7 @@ perl Makefile.PL --testuser=username
       $source->{$param} = "default";
       $opt->{$param} = $TESTDB;
     }
-    elsif ($param eq "testhost" || $param eq "testport"  ||
-        $param eq "testpassword" || $param eq "testsocket" ) {
+    elsif ($param eq "testpassword") {
       $source->{$param} = "default";
       $opt->{$param} = "";
     }
@@ -690,6 +710,9 @@ section "Linker flags" or type
   perl Makefile.PL --help
 MSG
     }
+    elsif ($param eq "testhost" || $param eq "testport" || $param eq "testsocket") {
+      # known parameter, but do nothing
+    }
     else {
       die "Unknown configuration parameter: $param";
     }