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:
@ -11,9 +11,9 @@
|
||||
#include "testconnections.h"
|
||||
#include "sysbench_commands.h"
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
int main(int argc, char* argv[])
|
||||
{
|
||||
TestConnections * Test = new TestConnections(argc, argv);
|
||||
TestConnections* Test = new TestConnections(argc, argv);
|
||||
|
||||
char sys1[4096];
|
||||
int port[3];
|
||||
@ -31,9 +31,9 @@ int main(int argc, char *argv[])
|
||||
Test->set_timeout(10000);
|
||||
Test->add_result(system(sys1), "Error executing sysbench prepare\n");
|
||||
|
||||
char *readonly;
|
||||
char *ro_on = (char *) "on";
|
||||
char *ro_off = (char *) "off";
|
||||
char* readonly;
|
||||
char* ro_on = (char*) "on";
|
||||
char* ro_off = (char*) "off";
|
||||
|
||||
Test->stop_timeout();
|
||||
|
||||
@ -41,7 +41,7 @@ int main(int argc, char *argv[])
|
||||
|
||||
Test->tprintf("Trying test with port %d\n", current_port);
|
||||
|
||||
if (current_port == Test->maxscales->readconn_slave_port[0] )
|
||||
if (current_port == Test->maxscales->readconn_slave_port[0])
|
||||
{
|
||||
readonly = ro_on;
|
||||
}
|
||||
@ -50,8 +50,13 @@ int main(int argc, char *argv[])
|
||||
readonly = ro_off;
|
||||
}
|
||||
|
||||
sprintf(&sys1[0], sysbench_command_long, Test->sysbench_dir, Test->sysbench_dir, Test->maxscales->IP[0],
|
||||
current_port, readonly);
|
||||
sprintf(&sys1[0],
|
||||
sysbench_command_long,
|
||||
Test->sysbench_dir,
|
||||
Test->sysbench_dir,
|
||||
Test->maxscales->IP[0],
|
||||
current_port,
|
||||
readonly);
|
||||
Test->set_log_copy_interval(300);
|
||||
Test->tprintf("Executing sysbench \n%s\n", sys1);
|
||||
if (system(sys1) != 0)
|
||||
@ -64,15 +69,15 @@ int main(int argc, char *argv[])
|
||||
printf("Dropping sysbanch tables!\n");
|
||||
fflush(stdout);
|
||||
|
||||
Test->try_query(Test->maxscales->conn_rwsplit[0], (char *) "DROP TABLE sbtest1");
|
||||
Test->try_query(Test->maxscales->conn_rwsplit[0], (char*) "DROP TABLE sbtest1");
|
||||
if (!Test->smoke)
|
||||
{
|
||||
Test->try_query(Test->maxscales->conn_rwsplit[0], (char *) "DROP TABLE sbtest2");
|
||||
Test->try_query(Test->maxscales->conn_rwsplit[0], (char *) "DROP TABLE sbtest3");
|
||||
Test->try_query(Test->maxscales->conn_rwsplit[0], (char *) "DROP TABLE sbtest4");
|
||||
Test->try_query(Test->maxscales->conn_rwsplit[0], (char*) "DROP TABLE sbtest2");
|
||||
Test->try_query(Test->maxscales->conn_rwsplit[0], (char*) "DROP TABLE sbtest3");
|
||||
Test->try_query(Test->maxscales->conn_rwsplit[0], (char*) "DROP TABLE sbtest4");
|
||||
}
|
||||
|
||||
//global_result += execute_query(Test->maxscales->conn_rwsplit[0], (char *) "DROP TABLE sbtest");
|
||||
// global_result += execute_query(Test->maxscales->conn_rwsplit[0], (char *) "DROP TABLE sbtest");
|
||||
|
||||
printf("closing connections to MaxScale!\n");
|
||||
fflush(stdout);
|
||||
|
||||
Reference in New Issue
Block a user