From 85c88fe6f1d622d10f5ac2d747412cb90f5cf150 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 1 Jul 2024 20:15:13 +0200 Subject: Merging debian version 1:11.4.2-1. Signed-off-by: Daniel Baumann debian/control debian/libmariadbd19.install debian/libmariadbd19.lintian-overrides debian/salsa-ci.yml --- debian/tests/upstream | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'debian/tests/upstream') diff --git a/debian/tests/upstream b/debian/tests/upstream index 6dc864d3..5c39949a 100644 --- a/debian/tests/upstream +++ b/debian/tests/upstream @@ -25,9 +25,9 @@ echo "using tmpdir: $WORKDIR/tmp" echo "Setting up skip-tests-list" # Use the arch specific skiplists if exist, otherwise list is empty -if [ -f "/usr/share/mysql/mysql-test/unstable-tests.$ARCH" ] +if [ -f "/usr/share/mariadb/mariadb-test/unstable-tests.$ARCH" ] then - cat "/usr/share/mysql/mysql-test/unstable-tests.$ARCH" >> "$MTR_SKIP_TEST_LIST" + cat "/usr/share/mariadb/mariadb-test/unstable-tests.$ARCH" >> "$MTR_SKIP_TEST_LIST" fi # Skip tests that cannot run properly on ci.debian.net / autopkgtests.ubuntu.com @@ -49,7 +49,7 @@ fi # failed autopkgtest runs cp -v "$MTR_SKIP_TEST_LIST" "$AUTOPKGTEST_ARTIFACTS" -cd /usr/share/mysql/mysql-test +cd /usr/share/mariadb/mariadb-test echo "starting mysql-test-tun.pl..." export MTR_PRINT_CORE=detailed # The $MTR_ARGUMENTS_APPEND is intentionally used to pass in extra arguments -- cgit v1.2.3