hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Uncrustify maxscale

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

60
server/core/test/test_config.cc
View File

@ -22,7 +22,7 @@
using namespace std;
#define TEST(a) do{if(!(a)){printf("Error: `" #a "` was not true\n");return 1;}}while(false)
#define TEST(a) do {if (!(a)) {printf("Error: `" #a "` was not true\n"); return 1;}} while (false)
int test_validity()
{
@ -36,14 +36,14 @@ int test_validity()
MXS_MODULE_PARAM params[] =
{
{"p1", MXS_MODULE_PARAM_INT, "-123"},
{"p2", MXS_MODULE_PARAM_COUNT, "123"},
{"p3", MXS_MODULE_PARAM_BOOL, "true"},
{"p4", MXS_MODULE_PARAM_STRING, "default"},
{"p5", MXS_MODULE_PARAM_ENUM, "a", MXS_MODULE_OPT_NONE, enum_values},
{"p6", MXS_MODULE_PARAM_PATH, "/tmp", MXS_MODULE_OPT_PATH_F_OK},
{"p7", MXS_MODULE_PARAM_SERVICE, "my-service"},
{"p8", MXS_MODULE_PARAM_ENUM, "a", MXS_MODULE_OPT_ENUM_UNIQUE, enum_values},
{"p1", MXS_MODULE_PARAM_INT, "-123" },
{"p2", MXS_MODULE_PARAM_COUNT, "123" },
{"p3", MXS_MODULE_PARAM_BOOL, "true" },
{"p4", MXS_MODULE_PARAM_STRING, "default" },
{"p5", MXS_MODULE_PARAM_ENUM, "a", MXS_MODULE_OPT_NONE, enum_values},
{"p6", MXS_MODULE_PARAM_PATH, "/tmp", MXS_MODULE_OPT_PATH_F_OK},
{"p7", MXS_MODULE_PARAM_SERVICE, "my-service" },
{"p8", MXS_MODULE_PARAM_ENUM, "a", MXS_MODULE_OPT_ENUM_UNIQUE, enum_values},
{MXS_END_MODULE_PARAMS}
};
@ -54,13 +54,16 @@ int test_validity()
TEST(config_param_is_valid(params, "p1", "1", &ctx));
TEST(config_param_is_valid(params, "p1", "-1", &ctx));
TEST(config_param_is_valid(params, "p1", "0", &ctx));
TEST(!config_param_is_valid(params, "p1", "should not be OK", &ctx)); // String value for int, should fail
TEST(!config_param_is_valid(params, "p1", "should not be OK", &ctx)); // String value for int, should
// fail
/** Count parameter */
TEST(config_param_is_valid(params, "p2", "1", &ctx));
TEST(config_param_is_valid(params, "p2", "0", &ctx));
TEST(!config_param_is_valid(params, "p2", "should not be OK", &ctx)); // String value for count, should fail
TEST(!config_param_is_valid(params, "p2", "-1", &ctx)); // Negative values for count should fail
TEST(!config_param_is_valid(params, "p2", "should not be OK", &ctx)); // String value for count, should
// fail
TEST(!config_param_is_valid(params, "p2", "-1", &ctx)); // Negative values for count
// should fail
/** Boolean parameter */
TEST(config_param_is_valid(params, "p3", "1", &ctx));
@ -76,7 +79,7 @@ int test_validity()
/** String parameter */
TEST(config_param_is_valid(params, "p4", "should be OK", &ctx));
TEST(!config_param_is_valid(params, "p4", "", &ctx)); // Empty string is not OK
TEST(!config_param_is_valid(params, "p4", "", &ctx)); // Empty string is not OK
/** Enum parameter */
TEST(config_param_is_valid(params, "p5", "a", &ctx));
@ -130,13 +133,13 @@ int test_add_parameter()
MXS_MODULE_PARAM params[] =
{
{"p1", MXS_MODULE_PARAM_INT, "-123"},
{"p2", MXS_MODULE_PARAM_COUNT, "123"},
{"p3", MXS_MODULE_PARAM_BOOL, "true"},
{"p4", MXS_MODULE_PARAM_STRING, "default"},
{"p5", MXS_MODULE_PARAM_ENUM, "a", MXS_MODULE_OPT_NONE, enum_values},
{"p6", MXS_MODULE_PARAM_PATH, "/tmp", MXS_MODULE_OPT_PATH_F_OK},
{"p7", MXS_MODULE_PARAM_SERVICE, "my-service"},
{"p1", MXS_MODULE_PARAM_INT, "-123" },
{"p2", MXS_MODULE_PARAM_COUNT, "123" },
{"p3", MXS_MODULE_PARAM_BOOL, "true" },
{"p4", MXS_MODULE_PARAM_STRING, "default" },
{"p5", MXS_MODULE_PARAM_ENUM, "a", MXS_MODULE_OPT_NONE, enum_values},
{"p6", MXS_MODULE_PARAM_PATH, "/tmp", MXS_MODULE_OPT_PATH_F_OK},
{"p7", MXS_MODULE_PARAM_SERVICE, "my-service" },
{MXS_END_MODULE_PARAMS}
};
@ -193,9 +196,9 @@ int test_required_parameters()
{
MXS_MODULE_PARAM params[] =
{
{"p1", MXS_MODULE_PARAM_INT, "-123", MXS_MODULE_OPT_REQUIRED},
{"p2", MXS_MODULE_PARAM_COUNT, "123", MXS_MODULE_OPT_REQUIRED},
{"p3", MXS_MODULE_PARAM_BOOL, "true", MXS_MODULE_OPT_REQUIRED},
{"p1", MXS_MODULE_PARAM_INT, "-123", MXS_MODULE_OPT_REQUIRED},
{"p2", MXS_MODULE_PARAM_COUNT, "123", MXS_MODULE_OPT_REQUIRED},
{"p3", MXS_MODULE_PARAM_BOOL, "true", MXS_MODULE_OPT_REQUIRED},
{MXS_END_MODULE_PARAMS}
};
@ -304,7 +307,6 @@ int dst_report(const DISK_SPACE_THRESHOLD_TEST& test,
return nErrors;
}
}
int test_disk_space_threshold()
@ -316,7 +318,7 @@ int test_disk_space_threshold()
{
"/data:80", true,
{
{ "/data", 80 }
{"/data", 80}
}
},
{
@ -346,9 +348,9 @@ int test_disk_space_threshold()
{
" /data1 : 40, /data2 :50, /data3: 70 ", true,
{
{ "/data1", 40 },
{ "/data2", 50 },
{ "/data3", 70 },
{"/data1", 40},
{"/data2", 50},
{"/data3", 70},
}
}
};
@ -369,7 +371,7 @@ int test_disk_space_threshold()
return nErrors;
}
int main(int argc, char **argv)
int main(int argc, char** argv)
{
int result = 0;