diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-07-01 18:15:13 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-07-01 18:15:13 +0000 |
commit | 85c88fe6f1d622d10f5ac2d747412cb90f5cf150 (patch) | |
tree | 310fa21dd40d6c7ad918d0771b5f03c378d54cc6 /debian/tests/upstream | |
parent | Merging upstream version 1:11.4.2. (diff) | |
download | mariadb-85c88fe6f1d622d10f5ac2d747412cb90f5cf150.tar.xz mariadb-85c88fe6f1d622d10f5ac2d747412cb90f5cf150.zip |
Merging debian version 1:11.4.2-1.HEADprogress-linux
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
debian/control
debian/libmariadbd19.install
debian/libmariadbd19.lintian-overrides
debian/salsa-ci.yml
Diffstat (limited to 'debian/tests/upstream')
-rw-r--r-- | debian/tests/upstream | 6 |
1 files changed, 3 insertions, 3 deletions
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 |