Commit 82c07b17 authored by Marko Mäkelä's avatar Marko Mäkelä

MDEV-25288 follow-up: Remove traces of unstable-tests

parent f4943b4a
...@@ -224,7 +224,6 @@ script: ...@@ -224,7 +224,6 @@ script:
- cd mysql-test - cd mysql-test
- travis_wait 30 ./mtr --force --max-test-fail=20 --parallel=4 --testcase-timeout=${TEST_CASE_TIMEOUT} - travis_wait 30 ./mtr --force --max-test-fail=20 --parallel=4 --testcase-timeout=${TEST_CASE_TIMEOUT}
--suite=${MYSQL_TEST_SUITES} --suite=${MYSQL_TEST_SUITES}
--skip-test-list=unstable-tests
--skip-test=binlog.binlog_unsafe --skip-test=binlog.binlog_unsafe
after_script: after_script:
......
...@@ -16,6 +16,6 @@ platform: x64 ...@@ -16,6 +16,6 @@ platform: x64
test_script: test_script:
- set PATH=C:\Strawberry\perl\bin;%PATH%;C:\Program Files (x86)\Windows Kits\10\Debuggers\x64 - set PATH=C:\Strawberry\perl\bin;%PATH%;C:\Program Files (x86)\Windows Kits\10\Debuggers\x64
- cd %APPVEYOR_BUILD_FOLDER%\win_build\mysql-test - 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 image: Visual Studio 2019
...@@ -4,4 +4,3 @@ usr/share/mysql/mysql-test/main ...@@ -4,4 +4,3 @@ usr/share/mysql/mysql-test/main
usr/share/mysql/mysql-test/plugin usr/share/mysql/mysql-test/plugin
usr/share/mysql/mysql-test/std_data usr/share/mysql/mysql-test/std_data
usr/share/mysql/mysql-test/suite usr/share/mysql/mysql-test/suite
usr/share/mysql/mysql-test/unstable-tests
...@@ -74,11 +74,7 @@ override_dh_auto_clean: ...@@ -74,11 +74,7 @@ override_dh_auto_clean:
@echo "RULES.$@" @echo "RULES.$@"
dh_testdir dh_testdir
dh_testroot dh_testroot
rm -rf $(BUILDDIR) builddir-native rm -rf $(BUILDDIR) builddir-native mysql-test/unstable-tests
[ ! -f debian/mysql-test-unstable-tests.orig ] || \
mv debian/mysql-test-unstable-tests.orig mysql-test/unstable-tests
debconf-updatepo # Update po-files when clean runs before each build debconf-updatepo # Update po-files when clean runs before each build
override_dh_auto_configure: override_dh_auto_configure:
...@@ -121,8 +117,7 @@ override_dh_auto_build: ...@@ -121,8 +117,7 @@ override_dh_auto_build:
override_dh_auto_test: override_dh_auto_test:
@echo "RULES.$@" @echo "RULES.$@"
dh_testdir dh_testdir
# Skip unstable tests if such are defined for arch touch mysql-test/unstable-tests
cp mysql-test/unstable-tests debian/mysql-test-unstable-tests.orig
[ ! -f debian/unstable-tests.$(DEB_HOST_ARCH) ] || cat debian/unstable-tests.$(DEB_HOST_ARCH) >> mysql-test/unstable-tests [ ! -f debian/unstable-tests.$(DEB_HOST_ARCH) ] || cat debian/unstable-tests.$(DEB_HOST_ARCH) >> mysql-test/unstable-tests
# Run testsuite # Run testsuite
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
......
...@@ -22,8 +22,7 @@ echo "using tmpdir: $WORKDIR/tmp" ...@@ -22,8 +22,7 @@ echo "using tmpdir: $WORKDIR/tmp"
echo "Setting up skip-tests-list" echo "Setting up skip-tests-list"
# Use unstable-tests list as base to skip all tests considered unstable touch $SKIP_TEST_LST
cp /usr/share/mysql/mysql-test/unstable-tests $SKIP_TEST_LST
# Also use arch specific skiplists if such files exist # Also use arch specific skiplists if such files exist
for filename in /usr/share/mysql/mysql-test/unstable-tests.* for filename in /usr/share/mysql/mysql-test/unstable-tests.*
......
...@@ -2,10 +2,8 @@ This directory contains test suites for the MariaDB server. To run ...@@ -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. currently existing test cases, execute ./mysql-test-run in this directory.
Some tests are known to fail on some platforms or be otherwise unreliable. 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 In the file collections/smoke_test there is a list of tests that are
a comment for every test. expected to be stable.
To exclude them from the test run, execute
# ./mysql-test-run --skip-test-list=unstable-tests
In general you do not have to have to do "make install", and you can have 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. a co-existing MariaDB installation, the tests will not conflict with it.
...@@ -15,7 +13,7 @@ In Red Hat distributions, you should run the script as user "mysql". ...@@ -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 The user is created with nologin shell, so the best bet is something like
# su - # su -
# cd /usr/share/mysql-test # 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 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), copy of the server process (using data files within /usr/share/mysql-test),
...@@ -27,8 +25,7 @@ the listed failures occur for you. ...@@ -27,8 +25,7 @@ the listed failures occur for you.
To clean up afterwards, remove the created "var" subdirectory, e.g. To clean up afterwards, remove the created "var" subdirectory, e.g.
# su -s /bin/bash - mysql -c "rm -rf /usr/share/mysql-test/var" # 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 If tests fail on your system, please read the following manual section
in lists of unstable tests, please read the following manual section
for instructions on how to report the problem: for instructions on how to report the problem:
https://mariadb.com/kb/en/reporting-bugs https://mariadb.com/kb/en/reporting-bugs
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment