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

6 files changed, 8 insertions, 19 deletions

diff --git a/.travis.yml b/.travis.yml
index f7f57b752d4..5c227b49b09 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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:
diff --git a/appveyor.yml b/appveyor.yml
index d5cd5231e6c..355c7f5aeeb 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -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
diff --git a/debian/mariadb-test-data.install b/debian/mariadb-test-data.install
index 26b69c2941b..718fc0e122c 100644
--- a/debian/mariadb-test-data.install
+++ b/debian/mariadb-test-data.install
@@ -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
diff --git a/debian/rules b/debian/rules
index 53c702f2b4c..123a0b9305e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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:
@@ -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)))
diff --git a/debian/tests/upstream b/debian/tests/upstream
index 4e9b3a7cc8b..51b0a60a0ac 100644
--- a/debian/tests/upstream
+++ b/debian/tests/upstream
@@ -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.*
diff --git a/mysql-test/README b/mysql-test/README
index 6c7f004a54d..14e9b3647ac 100644
--- a/mysql-test/README
+++ b/mysql-test/README
@@ -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.
@@ -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),
@@ -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