In test t/12embedded.t use new Makefile.PL option --testemboptions

This replaces the old undocumented DBD_MARIADB_TESTLANGDIR env variable.

Author: pali

t/12embedded.t

@@ -6,7 +6,7 @@ use DBI;
 use DBD::MariaDB;
 use File::Temp;
 
-use vars qw($test_dsn $test_user $test_password);
+use vars qw($test_dsn $test_user $test_password $test_emboptions);
 use lib 't', '.';
 require 'lib.pl';
 
@@ -31,9 +31,9 @@ sub fatal_connection_error {
 
 sub connect_to_embedded_server {
     my ($tmpdir, $database) = @_;
-    my $lang_arg = $ENV{DBD_MARIADB_TESTLANGDIR} ? ",--language=$ENV{DBD_MARIADB_TESTLANGDIR}" : '';
-    my $emb_dsn = "DBI:MariaDB:host=embedded;mariadb_embedded_options=--datadir=$tmpdir$lang_arg;";
-    $emb_dsn .= "database=$database" if defined $database;
+    my $emb_dsn = "DBI:MariaDB:host=embedded;mariadb_embedded_options=--datadir=$tmpdir";
+    $emb_dsn .= ",$test_emboptions" if length $test_emboptions;
+    $emb_dsn .= ";database=$database" if defined $database;
     return eval { DBI->connect($emb_dsn, undef, undef, { RaiseError => 1, PrintError => 0 }) };
 }
 
@@ -60,7 +60,7 @@ my $dbh2 = connect_to_embedded_server($tmpdir1, 'dbd_mariadb_embedded');
 ok(defined $dbh2, "Second connection to embedded server with datadir in $tmpdir1") or fatal_connection_error('embedded');
 
 my $dbh3 = connect_to_embedded_server($tmpdir1, 'dbd_mariadb_embedded');
-ok(defined $dbh3, "Third conection to embedded server with datadir in $tmpdir1") or fatal_connection_error('embedded');
+ok(defined $dbh3, "Third connection to embedded server with datadir in $tmpdir1") or fatal_connection_error('embedded');
 
 ok($dbh1->do('CREATE TABLE dbd_mariadb_embedded(id INT)'), 'Created table with first connection');
 ok($dbh2->do('INSERT INTO dbd_mariadb_embedded(id) VALUES(10)'), 'Inserted values into table with second connection');

t/lib.pl

@@ -3,7 +3,7 @@
 
 use Test::More;
 use FindBin qw($Bin);
-use vars qw($test_dsn $test_user $test_password $test_db);
+use vars qw($test_dsn $test_user $test_password $test_db $test_emboptions);
 
 use DBD::MariaDB;