Switch unstable test inject back to mtr parameter

As disabled.def intrepreted test names in a special way, switch
back to using --skip-test-list option

debian/changelog

-mariadb-10.0 (10.0.22-6~exp1) experimental; urgency=low
+mariadb-10.0 (10.0.22-6) UNRELEASED; urgency=low
 
-  * Add patch to make passwordless root login default on all new
+  * Add patches to make passwordless root login default on all new
     installs in all situations. Make auth_socket a built-in plugin.
   * Clean up previous passwordless root implementation so that it
     applies only to new installs and existing databases continue
     to operate with the passwords defined in their user tables.
+  * As disabled.def intrepreted test names in a special way, switch
+    back to using --skip-test-list option
 
  -- Otto Kekäläinen <otto@seravo.fi>  Thu, 17 Dec 2015 15:28:51 +0200
 

debian/rules

@@ -96,10 +96,10 @@ override_dh_auto_test:
 	@echo "RULES.$@"
 	dh_testdir
 	# Skip unstable tests if such are defined for arch
-	[ ! -f debian/unstable-tests.$(ARCH) ] || cat debian/unstable-tests.$(ARCH) >> mysql-test/disabled.def
+	[ ! -f debian/unstable-tests.$(ARCH) ] || cat debian/unstable-tests.$(ARCH) >> mysql-test/unstable-tests
 	# Run testsuite
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-	cd $(BUILDDIR)/mysql-test && ./mtr --force --testcase-timeout=30 --suite-timeout=540 --retry=3 --parallel=$(NUMJOBS)
+	cd $(BUILDDIR)/mysql-test && ./mtr --force --testcase-timeout=30 --suite-timeout=540 --retry=3 --parallel=$(NUMJOBS) --skip-test-list=unstable-tests
 endif
 
 override_dh_auto_install: