diff options
| author | Ladar Levison <ladar@lavabit.com> | 2018-11-22 06:27:08 +0300 |
|---|---|---|
| committer | Ladar Levison <ladar@lavabit.com> | 2018-11-22 06:27:08 +0300 |
| commit | 1d94156d24c7f15bd96e370b084a22e8aaf08b1e (patch) | |
| tree | 1266dbe4c4d2876ec6d2413529910b5c820c66c4 | |
| parent | 66e0c1d086e799947c518ede735f1773fbd58158 (diff) | |
Fixed the MySQL unit test include resolution bug.
| -rwxr-xr-x | dev/scripts/builders/build.lib.sh | 3 | ||||
| -rw-r--r-- | lib/patches/mysql/5.1.73_mysql_test_run_syntax.patch (renamed from lib/patches/mysql/mysql-test-run.patch) | 6 | ||||
| -rw-r--r-- | lib/patches/mysql/5.1.73_perl_inc_path.patch | 15 |
3 files changed, 20 insertions, 4 deletions
diff --git a/dev/scripts/builders/build.lib.sh b/dev/scripts/builders/build.lib.sh index 82a723fe..d26ace15 100755 --- a/dev/scripts/builders/build.lib.sh +++ b/dev/scripts/builders/build.lib.sh @@ -1144,7 +1144,8 @@ mysql() { mysql-prep) cd "$M_SOURCES/mysql"; error touch libtoolT; error - cat "$M_PATCHES/mysql/"mysql-test-run.patch | patch -p1 --verbose &>> "$M_LOGS/mysql.txt"; error + cat "$M_PATCHES/mysql/"5.1.73_mysql_test_run_syntax.patch | patch -p1 --verbose &>> "$M_LOGS/mysql.txt"; error + cat "$M_PATCHES/mysql/"5.1.73_perl_inc_path.patch | patch -p1 --verbose &>> "$M_LOGS/mysql.txt"; error ;; mysql-build) cd "$M_SOURCES/mysql"; error diff --git a/lib/patches/mysql/mysql-test-run.patch b/lib/patches/mysql/5.1.73_mysql_test_run_syntax.patch index 23971ffd..e9af7e50 100644 --- a/lib/patches/mysql/mysql-test-run.patch +++ b/lib/patches/mysql/5.1.73_mysql_test_run_syntax.patch @@ -11,14 +11,14 @@ diff -r 38122040f01c mysql-test/mysql-test-run.pl delete $children{$ret_pid}; } } - + - if ( not defined @$completed ) { + if ( not @$completed ) { mtr_error("Test suite aborted"); } - + if ( @$completed != $num_tests){ - + if ($opt_force){ # All test should have been run, print any that are still in $tests #foreach my $test ( @$tests ){ diff --git a/lib/patches/mysql/5.1.73_perl_inc_path.patch b/lib/patches/mysql/5.1.73_perl_inc_path.patch new file mode 100644 index 00000000..c2169c30 --- /dev/null +++ b/lib/patches/mysql/5.1.73_perl_inc_path.patch @@ -0,0 +1,15 @@ +diff --git a/mysql-test/Makefile.in b/mysql-test/Makefile.in +index 42cb381..797f59b 100644 +--- a/mysql-test/Makefile.in ++++ b/mysql-test/Makefile.in +@@ -232,8 +232,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PDFLATEX = @PDFLATEX@ + PDFMANUAL = @PDFMANUAL@ +-PERL = @PERL@ +-PERL5 = @PERL5@ ++PERL = @PERL@ -I. ++PERL5 = @PERL5@ -I. + PROTOCOL_VERSION = @PROTOCOL_VERSION@ + PS = @PS@ + RANLIB = @RANLIB@ |