summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2006-07-19 14:25:52 +0200
committerunknown <msvensson@neptunus.(none)>2006-07-19 14:25:52 +0200
commitd7b1a5f2a176e9be1789537d95b0efce5e4b770b (patch)
treeda96d8cd25bc39946abeae9f9373797de6f0958e /mysql-test/r
parent93a56475e1aea0c0ea4a2443f5fb0e43d77643c6 (diff)
downloadmariadb-git-d7b1a5f2a176e9be1789537d95b0efce5e4b770b.tar.gz
Update 'abort_not_supported_test' to print a reason why the test was aborted
and use it in mysql-test-run.pl Use standard defines as last argument to 'fn_format' mysql-test/r/not_ndb_default.require: Rename: mysql-test/r/true.require -> mysql-test/r/not_ndb_default.require client/mysqltest.c: Use proper defines for last argument to fn_format(they are defined in my_sys.h) Make abort_not_supported_test print info about in what file the test was aborted and a reason for it. The reason is a best guess, using the filename of the .require file to format it. mysql-test/include/not_ndb_default.inc: Use a more descriptive name of the .require file mysql-test/include/not_windows.inc: Use a more descriptive name of the .require file mysql-test/include/windows.inc: Use a more descriptive name of the .require file mysql-test/lib/mtr_io.pl: Add new function 'mtr_lastlinefromfile' that will return only the last line of a file. mysql-test/mysql-test-run.pl: Get reason why mysqltest decided to abort testcase from mysqltest.log mysql-test/r/not_windows.require: New BitKeeper file ``mysql-test/r/not_windows.require'' mysql-test/r/windows.require: New BitKeeper file ``mysql-test/r/windows.require''
Diffstat (limited to 'mysql-test/r')
-rw-r--r--mysql-test/r/not_ndb_default.require (renamed from mysql-test/r/true.require)0
-rw-r--r--mysql-test/r/not_windows.require2
-rw-r--r--mysql-test/r/windows.require2
3 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/r/true.require b/mysql-test/r/not_ndb_default.require
index 09aae1ed1d0..09aae1ed1d0 100644
--- a/mysql-test/r/true.require
+++ b/mysql-test/r/not_ndb_default.require
diff --git a/mysql-test/r/not_windows.require b/mysql-test/r/not_windows.require
new file mode 100644
index 00000000000..09aae1ed1d0
--- /dev/null
+++ b/mysql-test/r/not_windows.require
@@ -0,0 +1,2 @@
+TRUE
+1
diff --git a/mysql-test/r/windows.require b/mysql-test/r/windows.require
new file mode 100644
index 00000000000..09aae1ed1d0
--- /dev/null
+++ b/mysql-test/r/windows.require
@@ -0,0 +1,2 @@
+TRUE
+1