From 96d3f8abcbe51894d0a5f7c7cadd5219e0dc2823 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Otto=20Kek=C3=A4l=C3=A4inen?= Date: Sat, 4 Aug 2018 15:38:38 +0800 Subject: [PATCH] Revert "Remove the mariadb-test-* packages" (Closes: #888956) This reverts commit 27202e3286910482a35bc48cfd7cd16defb82cd3. The whole episoide with adding 10.2 and removing it was stupid. This and a lot of other mess needs to be reverted back. This revert will fix the autopkgtests so they pass. --- debian/control | 63 ++++++++++++++++++++++ debian/mariadb-test-data.install | 9 ++++ debian/mariadb-test-data.lintian-overrides | 18 +++++++ debian/mariadb-test.install | 34 ++++++++++++ debian/mariadb-test.links | 2 + debian/mariadb-test.lintian-overrides | 3 ++ debian/not-installed | 29 ---------- 7 files changed, 129 insertions(+), 29 deletions(-) create mode 100644 debian/mariadb-test-data.install create mode 100644 debian/mariadb-test-data.lintian-overrides create mode 100644 debian/mariadb-test.install create mode 100644 debian/mariadb-test.links create mode 100644 debian/mariadb-test.lintian-overrides diff --git a/debian/control b/debian/control index ec4581b9..6ffc2ec3 100644 --- a/debian/control +++ b/debian/control @@ -252,6 +252,7 @@ Description: MariaDB database core server files Package: mariadb-server-10.1 Architecture: any Suggests: mailx, + mariadb-test, netcat-openbsd, tinyca Recommends: libhtml-template-perl @@ -470,3 +471,65 @@ Depends: libcrack2 (>= 2.9.0), Description: CrackLib Password Validation Plugin for MariaDB This password validation plugin uses cracklib to allow only sufficiently secure (as defined by cracklib) user passwords in MariaDB. + +Package: mariadb-test +Architecture: any +Depends: libmariadbclient18 (= ${binary:Version}), + mariadb-client-10.1 (= ${binary:Version}), + mariadb-server-10.1 (= ${binary:Version}), + mariadb-test-data (= ${source:Version}), + virtual-mysql-testsuite, + ${misc:Depends}, + ${shlibs:Depends} +Breaks: mariadb-test-10.0, + mariadb-test-10.1, + mariadb-test-5.5, + mysql-testsuite, + mysql-testsuite-5.5, + mysql-testsuite-5.6, + mysql-testsuite-5.7 +Replaces: mariadb-test-10.0, + mariadb-test-10.1, + mariadb-test-5.5, + mysql-testsuite, + mysql-testsuite-5.5, + mysql-testsuite-5.6, + mysql-testsuite-5.7, + virtual-mysql-testsuite +Provides: virtual-mysql-testsuite +Suggests: patch +Description: MariaDB database regression test suite + MariaDB is a fast, stable and true multi-user, multi-threaded SQL database + server. SQL (Structured Query Language) is the most popular database query + language in the world. The main goals of MariaDB are speed, robustness and + ease of use. + . + This package includes the regression test suite. + +Package: mariadb-test-data +Architecture: all +Multi-Arch: foreign +Depends: ${misc:Depends} +Breaks: mariadb-test-10.0, + mariadb-test-10.1, + mariadb-test-5.5, + mariadb-test-data-10.0, + mysql-testsuite, + mysql-testsuite-5.5, + mysql-testsuite-5.6, + mysql-testsuite-5.7 +Replaces: mariadb-test-10.0, + mariadb-test-10.1, + mariadb-test-5.5, + mariadb-test-data-10.0, + mysql-testsuite, + mysql-testsuite-5.5, + mysql-testsuite-5.6, + mysql-testsuite-5.7 +Description: MariaDB database regression test suite - data files + MariaDB is a fast, stable and true multi-user, multi-threaded SQL database + server. SQL (Structured Query Language) is the most popular database query + language in the world. The main goals of MariaDB are speed, robustness and + ease of use. + . + This package has the architecture independent data files for the test suite. diff --git a/debian/mariadb-test-data.install b/debian/mariadb-test-data.install new file mode 100644 index 00000000..3cd11e1a --- /dev/null +++ b/debian/mariadb-test-data.install @@ -0,0 +1,9 @@ +usr/share/mysql/mysql-test/collections +usr/share/mysql/mysql-test/extra +usr/share/mysql/mysql-test/include +usr/share/mysql/mysql-test/plugin +usr/share/mysql/mysql-test/r +usr/share/mysql/mysql-test/std_data +usr/share/mysql/mysql-test/suite +usr/share/mysql/mysql-test/t +usr/share/mysql/mysql-test/unstable-tests diff --git a/debian/mariadb-test-data.lintian-overrides b/debian/mariadb-test-data.lintian-overrides new file mode 100644 index 00000000..9d6c1e73 --- /dev/null +++ b/debian/mariadb-test-data.lintian-overrides @@ -0,0 +1,18 @@ +# OK, this file is part of test suite and only used for a test +mariadb-test-data: executable-not-elf-or-script usr/share/mysql/mysql-test/suite/parts/r/partition_exch_myisam.result +mariadb-test-data: executable-not-elf-or-script usr/share/mysql/mysql-test/suite/parts/r/partition_exch_qa_7_innodb.result +mariadb-test-data: executable-not-elf-or-script usr/share/mysql/mysql-test/suite/parts/r/partition_exch_innodb.result +mariadb-test-data: executable-not-elf-or-script usr/share/mysql/mysql-test/suite/parts/r/partition_exch_qa_6.result +mariadb-test-data: executable-not-elf-or-script usr/share/mysql/mysql-test/suite/parts/r/partition_exch_qa_3.result +mariadb-test-data: executable-not-elf-or-script usr/share/mysql/mysql-test/suite/parts/r/partition_exch_qa.result +mariadb-test-data: executable-not-elf-or-script usr/share/mysql/mysql-test/suite/parts/r/partition_exch_myisam_innodb.result +mariadb-test-data: executable-not-elf-or-script usr/share/mysql/mysql-test/suite/parts/r/partition_exch_qa_11.result +mariadb-test-data: executable-not-elf-or-script usr/share/mysql/mysql-test/suite/parts/r/partition_exch_qa_5_innodb.result +mariadb-test-data: executable-not-elf-or-script usr/share/mysql/mysql-test/suite/parts/r/partition_exch_qa_4_myisam.result +mariadb-test-data: executable-not-elf-or-script usr/share/mysql/mysql-test/suite/parts/r/partition_exch_qa_7_myisam.result +mariadb-test-data: executable-not-elf-or-script usr/share/mysql/mysql-test/suite/parts/r/partition_exch_qa_14.result +mariadb-test-data: executable-not-elf-or-script usr/share/mysql/mysql-test/suite/parts/r/partition_exch_qa_8_myisam.result +mariadb-test-data: executable-not-elf-or-script usr/share/mysql/mysql-test/suite/parts/r/partition_exch_qa_8_innodb.result +mariadb-test-data: executable-not-elf-or-script usr/share/mysql/mysql-test/suite/parts/r/partition_exch_qa_5_myisam.result +mariadb-test-data: executable-not-elf-or-script usr/share/mysql/mysql-test/suite/parts/r/partition_exch_qa_4_innodb.result +mariadb-test-data: executable-not-elf-or-script usr/share/mysql/mysql-test/plugin/oqgraph/oqgraph/maintainer-general-record.sh diff --git a/debian/mariadb-test.install b/debian/mariadb-test.install new file mode 100644 index 00000000..5603af0b --- /dev/null +++ b/debian/mariadb-test.install @@ -0,0 +1,34 @@ +usr/bin/mysql_client_test +usr/bin/mysql_client_test_embedded +usr/bin/mysqltest +usr/bin/mysqltest_embedded +usr/lib/*/mariadb18/plugin/adt_null.so +usr/lib/*/mariadb18/plugin/auth_0x0100.so +usr/lib/*/mariadb18/plugin/auth_test_plugin.so +usr/lib/*/mariadb18/plugin/daemon_example.ini +usr/lib/*/mariadb18/plugin/debug_key_management.so +usr/lib/*/mariadb18/plugin/dialog_examples.so +usr/lib/*/mariadb18/plugin/example_key_management.so +usr/lib/*/mariadb18/plugin/ha_example.so +usr/lib/*/mariadb18/plugin/ha_test_sql_discovery.so +usr/lib/*/mariadb18/plugin/libdaemon_example.so +usr/lib/*/mariadb18/plugin/mypluglib.so +usr/lib/*/mariadb18/plugin/qa_auth_client.so +usr/lib/*/mariadb18/plugin/qa_auth_interface.so +usr/lib/*/mariadb18/plugin/qa_auth_server.so +usr/share/man/man1/mysql-stress-test.pl.1 +usr/share/man/man1/mysql-test-run.pl.1 +usr/share/man/man1/mysql_client_test.1 +usr/share/man/man1/mysql_client_test_embedded.1 +usr/share/man/man1/mysqltest.1 +usr/share/man/man1/mysqltest_embedded.1 +usr/share/mysql/mysql-test/README +usr/share/mysql/mysql-test/README.gcov +usr/share/mysql/mysql-test/README.stress +usr/share/mysql/mysql-test/disabled.def +usr/share/mysql/mysql-test/lib +usr/share/mysql/mysql-test/mysql-stress-test.pl +usr/share/mysql/mysql-test/mysql-test-run.pl +usr/share/mysql/mysql-test/purify.supp +usr/share/mysql/mysql-test/suite.pm +usr/share/mysql/mysql-test/valgrind.supp diff --git a/debian/mariadb-test.links b/debian/mariadb-test.links new file mode 100644 index 00000000..884b25a8 --- /dev/null +++ b/debian/mariadb-test.links @@ -0,0 +1,2 @@ +usr/share/mysql/mysql-test/mysql-test-run.pl usr/share/mysql/mysql-test/mtr +usr/share/mysql/mysql-test/mysql-test-run.pl usr/share/mysql/mysql-test/mysql-test-run diff --git a/debian/mariadb-test.lintian-overrides b/debian/mariadb-test.lintian-overrides new file mode 100644 index 00000000..83fe6db0 --- /dev/null +++ b/debian/mariadb-test.lintian-overrides @@ -0,0 +1,3 @@ +# OK, this file is part of test suite and only used for a test +mariadb-test: arch-dependent-file-in-usr-share usr/share/mysql/mysql-test/lib/My/SafeProcess/my_safe_process +mariadb-test: executable-not-elf-or-script usr/share/mysql/mysql-test/lib/generate-ssl-certs.sh diff --git a/debian/not-installed b/debian/not-installed index abf1c468..9e272d3a 100644 --- a/debian/not-installed +++ b/debian/not-installed @@ -357,35 +357,6 @@ usr/share/mysql/systemd/mariadb@.service usr/share/man/man1/mysqlbug.1 usr/share/man/man1/mysql.server.1 usr/share/man/man1/my_safe_process.1 -usr/share/mysql/mysql-test/collections -usr/share/mysql/mysql-test/extra -usr/share/mysql/mysql-test/include -usr/share/mysql/mysql-test/plugin -usr/share/mysql/mysql-test/r -usr/share/mysql/mysql-test/std_data -usr/share/mysql/mysql-test/suite -usr/share/mysql/mysql-test/t -usr/share/mysql/mysql-test/unstable-tests -usr/bin/mysql_client_test -usr/bin/mysql_client_test_embedded -usr/bin/mysqltest -usr/bin/mysqltest_embedded -usr/share/man/man1/mysql-stress-test.pl.1 -usr/share/man/man1/mysql-test-run.pl.1 -usr/share/man/man1/mysql_client_test.1 -usr/share/man/man1/mysql_client_test_embedded.1 -usr/share/man/man1/mysqltest.1 -usr/share/man/man1/mysqltest_embedded.1 -usr/share/mysql/mysql-test/README -usr/share/mysql/mysql-test/README.gcov -usr/share/mysql/mysql-test/README.stress -usr/share/mysql/mysql-test/disabled.def -usr/share/mysql/mysql-test/lib -usr/share/mysql/mysql-test/mysql-stress-test.pl -usr/share/mysql/mysql-test/mysql-test-run.pl -usr/share/mysql/mysql-test/purify.supp -usr/share/mysql/mysql-test/suite.pm -usr/share/mysql/mysql-test/valgrind.supp usr/share/groonga-normalizer-mysql/README.md usr/share/groonga-normalizer-mysql/lgpl-2.0.txt usr/share/mysql/mroonga/COPYING -- GitLab