Fix unit tests with cunit 2.1-3 (#124)

In CUnit 2.1-2 and before the CU_SuiteInfo structure looks like this:

    typedef struct CU_SuiteInfo {
        const char       *pName;
        CU_InitializeFunc pInitFunc;
        CU_CleanupFunc    pCleanupFunc;
        CU_TestInfo      *pTests;
    } CU_SuiteInfo;

In CUnit 2.1-3 it looks like this:

    typedef struct CU_SuiteInfo {
        const char       *pName;
        CU_InitializeFunc pInitFunc;
        CU_CleanupFunc    pCleanupFunc;
        CU_SetUpFunc      pSetUpFunc;
        CU_TearDownFunc   pTearDownFunc;
        CU_TestInfo      *pTests;
    } CU_SuiteInfo;

This commit changes the test code so it works with both CUnit 2.1-2 and CUnit
2.1-3.
This commit is contained in:
Éric Lemoine 2017-01-24 16:29:33 +01:00 committed by Sandro Santilli
parent dd2269cffe
commit 8cd3f4c15a
6 changed files with 36 additions and 6 deletions

View File

@ -541,4 +541,9 @@ CU_TestInfo bytes_tests[] = {
CU_TEST_INFO_NULL
};
CU_SuiteInfo bytes_suite = {"bytes", init_suite, clean_suite, bytes_tests};
CU_SuiteInfo bytes_suite = {
.pName = "bytes",
.pInitFunc = init_suite,
.pCleanupFunc = clean_suite,
.pTests = bytes_tests
};

View File

@ -750,4 +750,9 @@ CU_TestInfo patch_tests[] = {
CU_TEST_INFO_NULL
};
CU_SuiteInfo patch_suite = {"patch", init_suite, clean_suite, patch_tests};
CU_SuiteInfo patch_suite = {
.pName = "patch",
.pInitFunc = init_suite,
.pCleanupFunc = clean_suite,
.pTests = patch_tests
};

View File

@ -144,4 +144,9 @@ CU_TestInfo ght_tests[] = {
CU_TEST_INFO_NULL
};
CU_SuiteInfo ght_suite = {"ght", init_suite, clean_suite, ght_tests};
CU_SuiteInfo ght_suite = {
.pName = "ght",
.pInitFunc = init_suite,
.pCleanupFunc = clean_suite,
.pTests = ght_tests
};

View File

@ -261,4 +261,9 @@ CU_TestInfo lazperf_tests[] = {
CU_TEST_INFO_NULL
};
CU_SuiteInfo lazperf_suite = {"lazperf", init_suite, clean_suite, lazperf_tests};
CU_SuiteInfo lazperf_suite = {
.pName = "lazperf",
.pInitFunc = init_suite,
.pCleanupFunc = clean_suite,
.pTests = lazperf_tests
};

View File

@ -160,4 +160,9 @@ CU_TestInfo point_tests[] = {
CU_TEST_INFO_NULL
};
CU_SuiteInfo point_suite = {"point", init_suite, clean_suite, point_tests};
CU_SuiteInfo point_suite = {
.pName = "point",
.pInitFunc = init_suite,
.pCleanupFunc = clean_suite,
.pTests = point_tests
};

View File

@ -228,4 +228,9 @@ CU_TestInfo schema_tests[] = {
CU_TEST_INFO_NULL
};
CU_SuiteInfo schema_suite = {"schema", init_suite, clean_suite, schema_tests};
CU_SuiteInfo schema_suite = {
.pName = "schema",
.pInitFunc = init_suite,
.pCleanupFunc = clean_suite,
.pTests = schema_tests
};