Skip to content

Commit c05b1fe

Browse files
committed
MDEV-21654 binary library file pam_mariadb_mtr.so installed among test data files
lintian complains: arch-dependent-file-in-usr-share arch-independent-package-contains-binary-or-object
1 parent b1daecf commit c05b1fe

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

debian/mariadb-test-data.lintian-overrides

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
# These should be moved, see https://jira.mariadb.org/browse/MDEV-21654
2-
arch-dependent-file-in-usr-share [usr/share/mysql/mysql-test/suite/plugins/pam/pam_mariadb_mtr.so]
3-
arch-independent-package-contains-binary-or-object [usr/share/mysql/mysql-test/suite/plugins/pam/pam_mariadb_mtr.so]
41
# Mainly for support for *BSD family. Not right way to do but this is test package and not for production
52
incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mysql/mysql-test/std_data/checkDBI_DBD-MariaDB.pl]
63
incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mysql/mysql-test/suite/engines/rr_trx/run_stress_tx_rr.pl]

plugin/auth_pam/testing/CMakeLists.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ IF(CMAKE_C_COMPILER_ID MATCHES "Clang")
1010
PROPERTY COMPILE_FLAGS "-Wno-incompatible-pointer-types-discards-qualifiers")
1111
ENDIF()
1212

13-
SET(dest DESTINATION "${INSTALL_MYSQLTESTDIR}/suite/plugins/pam" COMPONENT Test)
14-
INSTALL(TARGETS pam_mariadb_mtr ${dest})
15-
INSTALL(FILES mariadb_mtr.conf RENAME mariadb_mtr ${dest})
13+
IF (NOT DEB) # avoid arch-dependent-file-in-usr-share error
14+
SET(dest DESTINATION "${INSTALL_MYSQLTESTDIR}/suite/plugins/pam" COMPONENT Test)
15+
INSTALL(TARGETS pam_mariadb_mtr ${dest})
16+
INSTALL(FILES mariadb_mtr.conf RENAME mariadb_mtr ${dest})
17+
ENDIF()

0 commit comments

Comments
 (0)