From 50d1e45cd49f39231ea9cc87f7c4a17f1617fc2f Mon Sep 17 00:00:00 2001 From: Nirbhay Choubey Date: Mon, 12 May 2014 12:45:02 -0400 Subject: [PATCH] MDEV#5925: New mariadb-galera-test packages Added logic for generation of 'galera' test packages. --- cmake/cpack_rpm.cmake | 5 +- debian/dist/Debian/control | 27 +++++-- debian/dist/Ubuntu/control | 27 +++++-- debian/mariadb-galera-test-5.5.dirs | 101 +++++++++++++++++++++++++++ debian/mariadb-galera-test-5.5.files | 15 ++++ debian/mariadb-galera-test-5.5.links | 2 + 6 files changed, 167 insertions(+), 10 deletions(-) create mode 100644 debian/mariadb-galera-test-5.5.dirs create mode 100644 debian/mariadb-galera-test-5.5.files create mode 100644 debian/mariadb-galera-test-5.5.links diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake index 1d373106d8d..9738de452b1 100644 --- a/cmake/cpack_rpm.cmake +++ b/cmake/cpack_rpm.cmake @@ -23,8 +23,7 @@ SET(CPACK_COMPONENT_SHAREDLIBRARIES_GROUP "shared") SET(CPACK_COMPONENT_COMMON_GROUP "common") SET(CPACK_COMPONENT_COMPAT_GROUP "compat") SET(CPACK_COMPONENTS_ALL Server ManPagesServer IniFiles Server_Scripts - SupportFiles Readme) - + SupportFiles Readme Test) SET(CPACK_RPM_PACKAGE_NAME "MariaDB-Galera") SET(CPACK_PACKAGE_FILE_NAME "${CPACK_RPM_PACKAGE_NAME}-${VERSION}-${RPM}-${CMAKE_SYSTEM_PROCESSOR}") @@ -147,6 +146,8 @@ SETA(CPACK_RPM_test_PACKAGE_OBSOLETES "MySQL-OurDelta-test") SETA(CPACK_RPM_test_PACKAGE_PROVIDES "MySQL-test") +SET(CPACK_RPM_test_PACKAGE_CONFLICTS + "MariaDB-test") SETA(CPACK_RPM_server_PACKAGE_REQUIRES ${CPACK_RPM_PACKAGE_REQUIRES} diff --git a/debian/dist/Debian/control b/debian/dist/Debian/control index 70c789ebe9a..47656f24bdf 100644 --- a/debian/dist/Debian/control +++ b/debian/dist/Debian/control @@ -10,9 +10,28 @@ Homepage: http://mariadb.org/ Vcs-Browser: http://bazaar.launchpad.net/~maria-captains/maria/5.5/files Vcs-Bzr: bzr://lp:maria +Package: mariadb-galera-test-5.5 +Section: database +Architecture: any +Depends: mariadb-galera-server-5.5 (= ${source:Version}), mariadb-client-5.5 (>= ${source:Version}) +Suggests: patch +Conflicts: mariadb-test, mariadb-galera-test (<< ${source:Version}), + mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3, + mariadb-test-5.5, + mariadb-server-5.5, mariadb-galera-server-5.5 (<< 5.5.33) +Replaces: mariadb-test (<< ${source:Version}), mariadb-galera-test (<< ${source:Version}), + mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3 +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-galera-server-5.5 Architecture: any -Suggests: tinyca, mailx, mariadb-test +Suggests: tinyca, mailx, mariadb-galera-test Recommends: libhtml-template-perl Pre-Depends: mariadb-common, adduser (>= 3.40), debconf Depends: mariadb-client-5.5 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), libmariadbclient18 (>= ${binary:Version}), galera (>=25.2) @@ -64,11 +83,11 @@ Description: MariaDB database client (metapackage depending on the latest versio maintainers. Install this package if in doubt about which MariaDB version you want, as this is the one we consider to be in the best shape. -Package: mariadb-test +Package: mariadb-galera-test Section: database Architecture: all -Depends: mariadb-test-5.5 (= ${source:Version}) +Depends: mariadb-galera-test-5.5 (= ${source:Version}) Description: MariaDB database regression test suite (metapackage depending on the latest version) This is an empty package that depends on the current "best" version of - mariadb-test (currently mariadb-test-5.5), as determined by the MariaDB + mariadb-galera-test (currently mariadb-galera-test-5.5), as determined by the MariaDB maintainers. diff --git a/debian/dist/Ubuntu/control b/debian/dist/Ubuntu/control index 27127535195..15a99a4a827 100644 --- a/debian/dist/Ubuntu/control +++ b/debian/dist/Ubuntu/control @@ -10,9 +10,28 @@ Homepage: http://mariadb.org/ Vcs-Browser: http://bazaar.launchpad.net/~maria-captains/maria/5.5/files Vcs-Bzr: bzr://lp:maria +Package: mariadb-galera-test-5.5 +Section: database +Architecture: any +Depends: mariadb-galera-server-5.5 (= ${source:Version}), mariadb-client-5.5 (>= ${source:Version}) +Suggests: patch +Conflicts: mariadb-test, mariadb-galera-test (<< ${source:Version}), + mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3, + mariadb-test-5.5, + mariadb-server-5.5, mariadb-galera-server-5.5 (<< 5.5.33) +Replaces: mariadb-test (<< ${source:Version}), mariadb-galera-test (<< ${source:Version}), + mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3 +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-galera-server-5.5 Architecture: any -Suggests: tinyca, mailx, mariadb-test +Suggests: tinyca, mailx, mariadb-galera-test Recommends: libhtml-template-perl Pre-Depends: mariadb-common, adduser (>= 3.40), debconf Depends: mariadb-client-5.5 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), libmariadbclient18 (>= ${binary:Version}), galera (>=25.2) @@ -64,11 +83,11 @@ Description: MariaDB database client (metapackage depending on the latest versio maintainers. Install this package if in doubt about which MariaDB version you want, as this is the one we consider to be in the best shape. -Package: mariadb-test +Package: mariadb-galera-test Section: database Architecture: all -Depends: mariadb-test-5.5 (= ${source:Version}) +Depends: mariadb-galera-test-5.5 (= ${source:Version}) Description: MariaDB database regression test suite (metapackage depending on the latest version) This is an empty package that depends on the current "best" version of - mariadb-test (currently mariadb-test-5.5), as determined by the MariaDB + mariadb-galera-test (currently mariadb-galera-test-5.5), as determined by the MariaDB maintainers. diff --git a/debian/mariadb-galera-test-5.5.dirs b/debian/mariadb-galera-test-5.5.dirs new file mode 100644 index 00000000000..4e75b80c8b3 --- /dev/null +++ b/debian/mariadb-galera-test-5.5.dirs @@ -0,0 +1,101 @@ +usr/bin +usr/share/man/man1 +usr/share/mysql/mysql-test +usr/share/mysql/mysql-test/extra +usr/share/mysql/mysql-test/extra/binlog_tests +usr/share/mysql/mysql-test/extra/rpl_tests +usr/share/mysql/mysql-test/lib +usr/share/mysql/mysql-test/lib/My +usr/share/mysql/mysql-test/lib/My/SafeProcess +usr/share/mysql/mysql-test/lib/My/File +usr/share/mysql/mysql-test/lib/v1 +usr/share/mysql/mysql-test/lib/v1/My +usr/share/mysql/mysql-test/collections +usr/share/mysql/mysql-test/t +usr/share/mysql/mysql-test/r +usr/share/mysql/mysql-test/include +usr/share/mysql/mysql-test/suite +usr/share/mysql/mysql-test/suite/parts +usr/share/mysql/mysql-test/suite/parts/inc +usr/share/mysql/mysql-test/suite/parts/t +usr/share/mysql/mysql-test/suite/parts/r +usr/share/mysql/mysql-test/suite/rpl_ndb +usr/share/mysql/mysql-test/suite/rpl_ndb/t +usr/share/mysql/mysql-test/suite/rpl_ndb/r +usr/share/mysql/mysql-test/suite/bugs +usr/share/mysql/mysql-test/suite/bugs/t +usr/share/mysql/mysql-test/suite/bugs/r +usr/share/mysql/mysql-test/suite/bugs/data +usr/share/mysql/mysql-test/suite/rpl +usr/share/mysql/mysql-test/suite/rpl/t +usr/share/mysql/mysql-test/suite/rpl/r +usr/share/mysql/mysql-test/suite/rpl/include +usr/share/mysql/mysql-test/suite/innodb +usr/share/mysql/mysql-test/suite/innodb/t +usr/share/mysql/mysql-test/suite/innodb/r +usr/share/mysql/mysql-test/suite/innodb/include +usr/share/mysql/mysql-test/suite/manual +usr/share/mysql/mysql-test/suite/manual/t +usr/share/mysql/mysql-test/suite/manual/r +usr/share/mysql/mysql-test/suite/stress +usr/share/mysql/mysql-test/suite/stress/t +usr/share/mysql/mysql-test/suite/stress/r +usr/share/mysql/mysql-test/suite/stress/include +usr/share/mysql/mysql-test/suite/jp +usr/share/mysql/mysql-test/suite/jp/t +usr/share/mysql/mysql-test/suite/jp/r +usr/share/mysql/mysql-test/suite/jp/include +usr/share/mysql/mysql-test/suite/jp/std_data +usr/share/mysql/mysql-test/suite/ndb +usr/share/mysql/mysql-test/suite/ndb/t +usr/share/mysql/mysql-test/suite/ndb/r +usr/share/mysql/mysql-test/suite/maria +usr/share/mysql/mysql-test/suite/maria/t +usr/share/mysql/mysql-test/suite/maria/r +usr/share/mysql/mysql-test/suite/funcs_2 +usr/share/mysql/mysql-test/suite/funcs_2/lib +usr/share/mysql/mysql-test/suite/funcs_2/t +usr/share/mysql/mysql-test/suite/funcs_2/charset +usr/share/mysql/mysql-test/suite/funcs_2/r +usr/share/mysql/mysql-test/suite/funcs_2/include +usr/share/mysql/mysql-test/suite/funcs_2/data +usr/share/mysql/mysql-test/suite/binlog +usr/share/mysql/mysql-test/suite/binlog/t +usr/share/mysql/mysql-test/suite/binlog/r +usr/share/mysql/mysql-test/suite/binlog/std_data +usr/share/mysql/mysql-test/suite/ndb_team +usr/share/mysql/mysql-test/suite/ndb_team/t +usr/share/mysql/mysql-test/suite/ndb_team/r +usr/share/mysql/mysql-test/suite/federated +usr/share/mysql/mysql-test/suite/funcs_1 +usr/share/mysql/mysql-test/suite/funcs_1/cursors +usr/share/mysql/mysql-test/suite/funcs_1/bitdata +usr/share/mysql/mysql-test/suite/funcs_1/views +usr/share/mysql/mysql-test/suite/funcs_1/storedproc +usr/share/mysql/mysql-test/suite/funcs_1/triggers +usr/share/mysql/mysql-test/suite/funcs_1/lib +usr/share/mysql/mysql-test/suite/funcs_1/t +usr/share/mysql/mysql-test/suite/funcs_1/r +usr/share/mysql/mysql-test/suite/funcs_1/include +usr/share/mysql/mysql-test/suite/funcs_1/datadict +usr/share/mysql/mysql-test/suite/vcol +usr/share/mysql/mysql-test/suite/vcol/inc +usr/share/mysql/mysql-test/suite/vcol/t +usr/share/mysql/mysql-test/suite/vcol/r +usr/share/mysql/mysql-test/suite/oqgraph +usr/share/mysql/mysql-test/suite/oqgraph/t +usr/share/mysql/mysql-test/suite/oqgraph/r +usr/share/mysql/mysql-test/suite/oqgraph/include +usr/share/mysql/mysql-test/suite/wsrep +usr/share/mysql/mysql-test/suite/wsrep/t +usr/share/mysql/mysql-test/suite/wsrep/r +usr/share/mysql/mysql-test/suite/galera +usr/share/mysql/mysql-test/suite/galera/t +usr/share/mysql/mysql-test/suite/galera/r +usr/share/mysql/mysql-test/std_data +usr/share/mysql/mysql-test/std_data/ndb_backup50 +usr/share/mysql/mysql-test/std_data/parts +usr/share/mysql/mysql-test/std_data/ndb_backup51_data_le +usr/share/mysql/mysql-test/std_data/ndb_backup51_data_be +usr/share/mysql/mysql-test/std_data/ndb_backup51 +usr/share/mysql/mysql-test/std_data/funcs_1 diff --git a/debian/mariadb-galera-test-5.5.files b/debian/mariadb-galera-test-5.5.files new file mode 100644 index 00000000000..79eb9520607 --- /dev/null +++ b/debian/mariadb-galera-test-5.5.files @@ -0,0 +1,15 @@ +usr/lib/mysql/plugin/dialog_examples.so +usr/lib/mysql/plugin/auth_test_plugin.so +usr/lib/mysql/plugin/qa_auth_interface.so +usr/lib/mysql/plugin/qa_auth_server.so +usr/lib/mysql/plugin/qa_auth_client.so +usr/lib/mysql/plugin/auth_0x0100.so +usr/lib/mysql/plugin/mypluglib.so +usr/lib/mysql/plugin/daemon_example.ini +usr/lib/mysql/plugin/libdaemon_example.so +usr/lib/mysql/plugin/adt_null.so +usr/bin/mysql_client_test +usr/share/man/man1/mysql_client_test.1 +usr/bin/mysqltest +usr/share/man/man1/mysqltest.1 +usr/share/mysql/mysql-test diff --git a/debian/mariadb-galera-test-5.5.links b/debian/mariadb-galera-test-5.5.links new file mode 100644 index 00000000000..082680fe5ed --- /dev/null +++ b/debian/mariadb-galera-test-5.5.links @@ -0,0 +1,2 @@ +usr/share/mysql/mysql-test/mysql-test-run.pl usr/share/mysql/mysql-test/mysql-test-run +usr/share/mysql/mysql-test/mysql-test-run.pl usr/share/mysql/mysql-test/mtr