Uncrustify maxscale
See script directory for method. The script to run in the top level MaxScale directory is called maxscale-uncrustify.sh, which uses another script, list-src, from the same directory (so you need to set your PATH). The uncrustify version was 0.66.
This commit is contained in:
@ -16,58 +16,58 @@
|
||||
static struct result
|
||||
{
|
||||
const char* query;
|
||||
int reply;
|
||||
int reply;
|
||||
} queries[] =
|
||||
{
|
||||
{"select @@server_id; -- maxscale begin route to master", SERVER1},
|
||||
{"select @@server_id;", SERVER1},
|
||||
{"select @@server_id; -- maxscale route to server server3", SERVER3},
|
||||
{"select @@server_id;", SERVER1},
|
||||
{"select @@server_id; -- maxscale end", SERVER2},
|
||||
{"select @@server_id; -- maxscale named1 prepare route to master", SERVER2},
|
||||
{"select @@server_id; -- maxscale named1 begin", SERVER1},
|
||||
{"select @@server_id;", SERVER1},
|
||||
{"select @@server_id; -- maxscale route to server server3", SERVER3},
|
||||
{"select @@server_id;", SERVER1},
|
||||
{"select @@server_id; -- maxscale end", SERVER2},
|
||||
{"select @@server_id; -- maxscale shorthand1 begin route to server server2", SERVER2},
|
||||
{"select @@server_id;", SERVER2},
|
||||
{"select @@server_id; -- maxscale route to server server3", SERVER3},
|
||||
{"select @@server_id;", SERVER2},
|
||||
{"select @@server_id; -- maxscale end", SERVER2},
|
||||
{"select @@server_id; # maxscale begin route to master", SERVER1},
|
||||
{"select @@server_id;", SERVER1},
|
||||
{"select @@server_id; # maxscale route to server server3", SERVER3},
|
||||
{"select @@server_id;", SERVER1},
|
||||
{"select @@server_id; # maxscale end", SERVER2},
|
||||
{"select @@server_id; # maxscale named2 prepare route to master", SERVER2},
|
||||
{"select @@server_id; # maxscale named2 begin", SERVER1},
|
||||
{"select @@server_id;", SERVER1},
|
||||
{"select @@server_id; # maxscale route to server server3", SERVER3},
|
||||
{"select @@server_id;", SERVER1},
|
||||
{"select @@server_id; # maxscale end", SERVER2},
|
||||
{"select @@server_id; # maxscale shorthand2 begin route to server server2", SERVER2},
|
||||
{"select @@server_id;", SERVER2},
|
||||
{"select @@server_id; # maxscale route to server server3", SERVER3},
|
||||
{"select @@server_id;", SERVER2},
|
||||
{"select @@server_id; # maxscale end", SERVER2},
|
||||
{"select @@server_id/* maxscale begin route to master */;", SERVER1},
|
||||
{"select @@server_id;", SERVER1},
|
||||
{"select @@server_id/* maxscale route to server server3 */;", SERVER3},
|
||||
{"select @@server_id;", SERVER1},
|
||||
{"select @@server_id/* maxscale end */;", SERVER2},
|
||||
{"select @@server_id/* maxscale named3 prepare route to master */;", SERVER2},
|
||||
{"select @@server_id/* maxscale named3 begin */;", SERVER1},
|
||||
{"select @@server_id;", SERVER1},
|
||||
{"select @@server_id/* maxscale route to server server3 */;", SERVER3},
|
||||
{"select @@server_id;", SERVER1},
|
||||
{"select @@server_id/* maxscale end */;", SERVER2},
|
||||
{"select @@server_id; -- maxscale begin route to master", SERVER1},
|
||||
{"select @@server_id;", SERVER1},
|
||||
{"select @@server_id; -- maxscale route to server server3", SERVER3},
|
||||
{"select @@server_id;", SERVER1},
|
||||
{"select @@server_id; -- maxscale end", SERVER2},
|
||||
{"select @@server_id; -- maxscale named1 prepare route to master", SERVER2},
|
||||
{"select @@server_id; -- maxscale named1 begin", SERVER1},
|
||||
{"select @@server_id;", SERVER1},
|
||||
{"select @@server_id; -- maxscale route to server server3", SERVER3},
|
||||
{"select @@server_id;", SERVER1},
|
||||
{"select @@server_id; -- maxscale end", SERVER2},
|
||||
{"select @@server_id; -- maxscale shorthand1 begin route to server server2", SERVER2},
|
||||
{"select @@server_id;", SERVER2},
|
||||
{"select @@server_id; -- maxscale route to server server3", SERVER3},
|
||||
{"select @@server_id;", SERVER2},
|
||||
{"select @@server_id; -- maxscale end", SERVER2},
|
||||
{"select @@server_id; # maxscale begin route to master", SERVER1},
|
||||
{"select @@server_id;", SERVER1},
|
||||
{"select @@server_id; # maxscale route to server server3", SERVER3},
|
||||
{"select @@server_id;", SERVER1},
|
||||
{"select @@server_id; # maxscale end", SERVER2},
|
||||
{"select @@server_id; # maxscale named2 prepare route to master", SERVER2},
|
||||
{"select @@server_id; # maxscale named2 begin", SERVER1},
|
||||
{"select @@server_id;", SERVER1},
|
||||
{"select @@server_id; # maxscale route to server server3", SERVER3},
|
||||
{"select @@server_id;", SERVER1},
|
||||
{"select @@server_id; # maxscale end", SERVER2},
|
||||
{"select @@server_id; # maxscale shorthand2 begin route to server server2", SERVER2},
|
||||
{"select @@server_id;", SERVER2},
|
||||
{"select @@server_id; # maxscale route to server server3", SERVER3},
|
||||
{"select @@server_id;", SERVER2},
|
||||
{"select @@server_id; # maxscale end", SERVER2},
|
||||
{"select @@server_id/* maxscale begin route to master */;", SERVER1},
|
||||
{"select @@server_id;", SERVER1},
|
||||
{"select @@server_id/* maxscale route to server server3 */;", SERVER3},
|
||||
{"select @@server_id;", SERVER1},
|
||||
{"select @@server_id/* maxscale end */;", SERVER2},
|
||||
{"select @@server_id/* maxscale named3 prepare route to master */;", SERVER2},
|
||||
{"select @@server_id/* maxscale named3 begin */;", SERVER1},
|
||||
{"select @@server_id;", SERVER1},
|
||||
{"select @@server_id/* maxscale route to server server3 */;", SERVER3},
|
||||
{"select @@server_id;", SERVER1},
|
||||
{"select @@server_id/* maxscale end */;", SERVER2},
|
||||
{"select @@server_id/* maxscale shorthand3 begin route to server server2 */; ", SERVER2},
|
||||
{"select @@server_id;", SERVER2},
|
||||
{"select @@server_id/* maxscale route to server server3 */;", SERVER3},
|
||||
{"select @@server_id;", SERVER2},
|
||||
{"select @@server_id/* maxscale end */;", SERVER2},
|
||||
{NULL, SERVER1}
|
||||
{"select @@server_id;", SERVER2},
|
||||
{"select @@server_id/* maxscale route to server server3 */;", SERVER3},
|
||||
{"select @@server_id;", SERVER2},
|
||||
{"select @@server_id/* maxscale end */;", SERVER2},
|
||||
{NULL, SERVER1}
|
||||
};
|
||||
|
||||
int main(int argc, char** argv)
|
||||
@ -90,12 +90,14 @@ int main(int argc, char** argv)
|
||||
find_field(test->maxscales->conn_rwsplit[0], queries[i].query, "@@server_id", str);
|
||||
if (strcmp(server_id[queries[i].reply], str) != 0)
|
||||
{
|
||||
test->add_result(1, "%s: Expected %s but got %s.\n",
|
||||
queries[i].query, server_id[queries[i].reply], str);
|
||||
test->add_result(1,
|
||||
"%s: Expected %s but got %s.\n",
|
||||
queries[i].query,
|
||||
server_id[queries[i].reply],
|
||||
str);
|
||||
}
|
||||
}
|
||||
int rval = test->global_result;
|
||||
delete test;
|
||||
return rval;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user