mirror of
https://github.com/MariaDB/server.git
synced 2025-08-07 00:04:31 +03:00
Add "skip" function, makeing mysqltest return an
error code indicating test should be skipped
This commit is contained in:
@@ -276,7 +276,7 @@ enum enum_commands {
|
|||||||
Q_IF,
|
Q_IF,
|
||||||
Q_DISABLE_PARSING, Q_ENABLE_PARSING,
|
Q_DISABLE_PARSING, Q_ENABLE_PARSING,
|
||||||
Q_REPLACE_REGEX, Q_REMOVE_FILE, Q_FILE_EXIST,
|
Q_REPLACE_REGEX, Q_REMOVE_FILE, Q_FILE_EXIST,
|
||||||
Q_WRITE_FILE, Q_COPY_FILE, Q_PERL, Q_DIE, Q_EXIT,
|
Q_WRITE_FILE, Q_COPY_FILE, Q_PERL, Q_DIE, Q_EXIT, Q_SKIP,
|
||||||
Q_CHMOD_FILE, Q_APPEND_FILE, Q_CAT_FILE, Q_DIFF_FILES,
|
Q_CHMOD_FILE, Q_APPEND_FILE, Q_CAT_FILE, Q_DIFF_FILES,
|
||||||
|
|
||||||
Q_UNKNOWN, /* Unknown command. */
|
Q_UNKNOWN, /* Unknown command. */
|
||||||
@@ -358,6 +358,7 @@ const char *command_names[]=
|
|||||||
"die",
|
"die",
|
||||||
/* Don't execute any more commands, compare result */
|
/* Don't execute any more commands, compare result */
|
||||||
"exit",
|
"exit",
|
||||||
|
"skip",
|
||||||
"chmod",
|
"chmod",
|
||||||
"append_file",
|
"append_file",
|
||||||
"cat_file",
|
"cat_file",
|
||||||
@@ -6258,6 +6259,9 @@ int main(int argc, char **argv)
|
|||||||
/* Stop processing any more commands */
|
/* Stop processing any more commands */
|
||||||
abort_flag= 1;
|
abort_flag= 1;
|
||||||
break;
|
break;
|
||||||
|
case Q_SKIP:
|
||||||
|
abort_not_supported_test("%s", command->first_argument);
|
||||||
|
break;
|
||||||
|
|
||||||
case Q_RESULT:
|
case Q_RESULT:
|
||||||
die("result, deprecated command");
|
die("result, deprecated command");
|
||||||
|
Reference in New Issue
Block a user