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

@ -3,36 +3,36 @@
* open 70 connections to all Maxscale services
* close connections
* TEST1: check value of "Persistent measured pool size" parameter in 'maxadmin' output, expect:
@verbatim
server1: 1
server2: 5
server3: 10
server4: 30
gserver1: 10
gserver2: 15
gserver3: 0
gserver4: 0
@endverbatim
* @verbatim
* server1: 1
* server2: 5
* server3: 10
* server4: 30
* gserver1: 10
* gserver2: 15
* gserver3: 0
* gserver4: 0
* @endverbatim
* Test2: wait 10 seconds, check "Persistent measured pool size" again. expect the same
* Test3: wait 30 seconds more, expect:
@verbatim
server1: 1
server2: 5
server3: 10
server4: 0
gserver1: 10
gserver2: 0
gserver3: 0
gserver4: 0
@endverbatim
* @verbatim
* server1: 1
* server2: 5
* server3: 10
* server4: 0
* gserver1: 10
* gserver2: 0
* gserver3: 0
* gserver4: 0
* @endverbatim
*
*/
#include "testconnections.h"
#include "maxadmin_operations.h"
void check_pers_conn(TestConnections* Test, int pers_conn_expected[], char * server)
void check_pers_conn(TestConnections* Test, int pers_conn_expected[], char* server)
{
char result[1024];
char str[256];
@ -41,20 +41,24 @@ void check_pers_conn(TestConnections* Test, int pers_conn_expected[], char * ser
for (int i = 0; i < 4; i++)
{
sprintf(str, "show server %s%d", server, i + 1);
Test->maxscales->get_maxadmin_param(0, str, (char *) "Persistent measured pool size:", result);
Test->maxscales->get_maxadmin_param(0, str, (char*) "Persistent measured pool size:", result);
Test->tprintf("%s: %s\n", str, result);
sscanf(result, "%d", &pers_conn[i]);
if (pers_conn[i] != pers_conn_expected[i])
{
Test->add_result(1, "Persistent measured pool size: %s%d has %d, but expected %d\n", server, i + 1,
pers_conn[i], pers_conn_expected[i]);
Test->add_result(1,
"Persistent measured pool size: %s%d has %d, but expected %d\n",
server,
i + 1,
pers_conn[i],
pers_conn_expected[i]);
}
}
}
int main(int argc, char *argv[])
int main(int argc, char* argv[])
{
TestConnections * Test = new TestConnections(argc, argv);
TestConnections* Test = new TestConnections(argc, argv);
int pers_conn_expected[4];
int galera_pers_conn_expected[4];
@ -75,10 +79,10 @@ int main(int argc, char *argv[])
Test->set_timeout(20);
Test->tprintf("Test 1:");
check_pers_conn(Test, pers_conn_expected, (char *) "server");
check_pers_conn(Test, pers_conn_expected, (char*) "server");
Test->tprintf("Galera: ");
check_pers_conn(Test, galera_pers_conn_expected, (char *) "gserver");
check_pers_conn(Test, galera_pers_conn_expected, (char*) "gserver");
Test->stop_timeout();
@ -87,10 +91,10 @@ int main(int argc, char *argv[])
Test->set_timeout(20);
Test->tprintf("Test 2:");
check_pers_conn(Test, pers_conn_expected, (char *) "server");
check_pers_conn(Test, pers_conn_expected, (char*) "server");
Test->tprintf("Galera: ");
check_pers_conn(Test, galera_pers_conn_expected, (char *) "gserver");
check_pers_conn(Test, galera_pers_conn_expected, (char*) "gserver");
Test->tprintf("Sleeping 30 seconds");
Test->stop_timeout();
@ -109,10 +113,10 @@ int main(int argc, char *argv[])
galera_pers_conn_expected[2] = 0;
galera_pers_conn_expected[3] = 0;
check_pers_conn(Test, pers_conn_expected, (char *) "server");
check_pers_conn(Test, pers_conn_expected, (char*) "server");
Test->tprintf("Galera: ");
check_pers_conn(Test, galera_pers_conn_expected, (char *) "gserver");
check_pers_conn(Test, galera_pers_conn_expected, (char*) "gserver");
Test->tprintf("Sleeping 30 seconds");
Test->stop_timeout();
@ -131,10 +135,10 @@ int main(int argc, char *argv[])
galera_pers_conn_expected[2] = 0;
galera_pers_conn_expected[3] = 0;
check_pers_conn(Test, pers_conn_expected, (char *) "server");
check_pers_conn(Test, pers_conn_expected, (char*) "server");
Test->tprintf("Galera: ");
check_pers_conn(Test, galera_pers_conn_expected, (char *) "gserver");
check_pers_conn(Test, galera_pers_conn_expected, (char*) "gserver");
int rval = Test->global_result;
delete Test;
return rval;