Skip to content

Commit

Permalink
MDEV-25288 follow-up: Remove traces of unstable-tests
Browse files Browse the repository at this point in the history
  • Loading branch information
dr-m committed Jun 11, 2021
1 parent f4943b4 commit 82c07b1
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 19 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,6 @@ script:
- cd mysql-test
- travis_wait 30 ./mtr --force --max-test-fail=20 --parallel=4 --testcase-timeout=${TEST_CASE_TIMEOUT}
--suite=${MYSQL_TEST_SUITES}
--skip-test-list=unstable-tests
--skip-test=binlog.binlog_unsafe

after_script:
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ platform: x64
test_script:
- set PATH=C:\Strawberry\perl\bin;%PATH%;C:\Program Files (x86)\Windows Kits\10\Debuggers\x64
- cd %APPVEYOR_BUILD_FOLDER%\win_build\mysql-test
- perl mysql-test-run.pl --force --max-test-fail=10 --parallel=4 --testcase-timeout=10 --skip-test-list=unstable-tests --suite=main
- perl mysql-test-run.pl --force --max-test-fail=10 --parallel=4 --testcase-timeout=10 --suite=main

image: Visual Studio 2019
1 change: 0 additions & 1 deletion debian/mariadb-test-data.install
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@ usr/share/mysql/mysql-test/main
usr/share/mysql/mysql-test/plugin
usr/share/mysql/mysql-test/std_data
usr/share/mysql/mysql-test/suite
usr/share/mysql/mysql-test/unstable-tests
9 changes: 2 additions & 7 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,7 @@ override_dh_auto_clean:
@echo "RULES.$@"
dh_testdir
dh_testroot
rm -rf $(BUILDDIR) builddir-native

[ ! -f debian/mysql-test-unstable-tests.orig ] || \
mv debian/mysql-test-unstable-tests.orig mysql-test/unstable-tests

rm -rf $(BUILDDIR) builddir-native mysql-test/unstable-tests
debconf-updatepo # Update po-files when clean runs before each build

override_dh_auto_configure:
Expand Down Expand Up @@ -121,8 +117,7 @@ override_dh_auto_build:
override_dh_auto_test:
@echo "RULES.$@"
dh_testdir
# Skip unstable tests if such are defined for arch
cp mysql-test/unstable-tests debian/mysql-test-unstable-tests.orig
touch mysql-test/unstable-tests
[ ! -f debian/unstable-tests.$(DEB_HOST_ARCH) ] || cat debian/unstable-tests.$(DEB_HOST_ARCH) >> mysql-test/unstable-tests
# Run testsuite
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
Expand Down
3 changes: 1 addition & 2 deletions debian/tests/upstream
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ echo "using tmpdir: $WORKDIR/tmp"

echo "Setting up skip-tests-list"

# Use unstable-tests list as base to skip all tests considered unstable
cp /usr/share/mysql/mysql-test/unstable-tests $SKIP_TEST_LST
touch $SKIP_TEST_LST

# Also use arch specific skiplists if such files exist
for filename in /usr/share/mysql/mysql-test/unstable-tests.*
Expand Down
11 changes: 4 additions & 7 deletions mysql-test/README
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@ This directory contains test suites for the MariaDB server. To run
currently existing test cases, execute ./mysql-test-run in this directory.

Some tests are known to fail on some platforms or be otherwise unreliable.
The file "unstable-tests" contains the list of such tests along with
a comment for every test.
To exclude them from the test run, execute
# ./mysql-test-run --skip-test-list=unstable-tests
In the file collections/smoke_test there is a list of tests that are
expected to be stable.

In general you do not have to have to do "make install", and you can have
a co-existing MariaDB installation, the tests will not conflict with it.
Expand All @@ -15,7 +13,7 @@ In Red Hat distributions, you should run the script as user "mysql".
The user is created with nologin shell, so the best bet is something like
# su -
# cd /usr/share/mysql-test
# su -s /bin/bash mysql -c "./mysql-test-run --skip-test-list=unstable-tests"
# su -s /bin/bash mysql -c ./mysql-test-run

This will use the installed MariaDB executables, but will run a private
copy of the server process (using data files within /usr/share/mysql-test),
Expand All @@ -27,8 +25,7 @@ the listed failures occur for you.
To clean up afterwards, remove the created "var" subdirectory, e.g.
# su -s /bin/bash - mysql -c "rm -rf /usr/share/mysql-test/var"

If one or more tests fail on your system on reasons other than listed
in lists of unstable tests, please read the following manual section
If tests fail on your system, please read the following manual section
for instructions on how to report the problem:

https://mariadb.com/kb/en/reporting-bugs
Expand Down

0 comments on commit 82c07b1

Please sign in to comment.