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:
Niclas Antti
2018-09-09 22:26:19 +03:00
parent fa7ec95069
commit c447e5cf15
849 changed files with 35002 additions and 27238 deletions

View File

@ -6,17 +6,20 @@
#include <iostream>
#include "testconnections.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);
// Reset server settings by replacing the config files
Test->repl->reset_server_settings();
std::string src = std::string(test_dir) + "/mdbci/add_core_cnf.sh";
Test->maxscales->copy_to_node(0, src.c_str(), Test->maxscales->access_homedir[0]);
Test->maxscales->ssh_node_f(0, true, "%s/add_core_cnf.sh %s", Test->maxscales->access_homedir[0],
Test->maxscales->ssh_node_f(0,
true,
"%s/add_core_cnf.sh %s",
Test->maxscales->access_homedir[0],
Test->verbose ? "verbose" : "");
Test->set_timeout(10);
@ -30,12 +33,16 @@ int main(int argc, char *argv[])
if ((Test->galera != NULL) && (Test->galera->N != 0))
{
Test->tprintf("Connecting to Maxscale router with Galera backend\n");
MYSQL * g_conn = open_conn(4016 , Test->maxscales->IP[0], Test->maxscales->user_name, Test->maxscales->password, Test->ssl);
if (g_conn != NULL )
MYSQL* g_conn = open_conn(4016,
Test->maxscales->IP[0],
Test->maxscales->user_name,
Test->maxscales->password,
Test->ssl);
if (g_conn != NULL)
{
Test->tprintf("Testing connection\n");
Test->add_result(Test->try_query(g_conn, (char *) "SELECT 1"),
(char *) "Error executing query against RWSplit Galera\n");
Test->add_result(Test->try_query(g_conn, (char*) "SELECT 1"),
(char*) "Error executing query against RWSplit Galera\n");
}
}
else
@ -47,13 +54,13 @@ int main(int argc, char *argv[])
Test->check_maxscale_alive(0);
int exit_code = 0;
char * ver = Test->maxscales->ssh_node_output(0, "maxscale --version-full", false, &exit_code);
char* ver = Test->maxscales->ssh_node_output(0, "maxscale --version-full", false, &exit_code);
Test->tprintf("Maxscale_full_version_start:\n%s\nMaxscale_full_version_end\n", ver);
if ((Test->global_result == 0) && (Test->use_snapshots))
{
Test->tprintf("Taking snapshot\n");
Test->take_snapshot((char *) "clean");
Test->take_snapshot((char*) "clean");
}
else
{