colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: use memcmp() instead of g_assert_cmpmem() for now

Browse Source 
g_assert_cmpmem() isn't available until glib 2.46, while the minimum
glib version required by ModemManager is 2.36. This patch replaces the
uses of g_assert_cmpmem() with memcmp() instead.
This commit is contained in:
Ben Chan
2018-11-07 10:26:23 -08:00
committed by Aleksander Morgado
parent 2522efb359
commit bf1b396596
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libmm-glib/tests/test-pco.c
View File

@@ -76,8 +76,7 @@ test_pco_list_add (void)
pco_data = mm_pco_get_data (pco, &pco_data_size); pco_data = mm_pco_get_data (pco, &pco_data_size);
g_assert (pco_data != NULL); g_assert (pco_data != NULL);
g_assert_cmpuint (pco_data_size, ==, expected_pco->pco_data_size); g_assert_cmpuint (pco_data_size, ==, expected_pco->pco_data_size);
g_assert_cmpmem (pco_data, pco_data_size, g_assert_cmpint (memcmp (pco_data, expected_pco->pco_data, pco_data_size), ==, 0);
expected_pco->pco_data, expected_pco->pco_data_size);
} }
mm_pco_list_free (list); mm_pco_list_free (list);

3
plugins/altair/tests/test-modem-helpers-altair-lte.c
View File

@@ -164,8 +164,7 @@ test_parse_vendor_pco_info (void)
pco_data = mm_pco_get_data (pco, &pco_data_size); pco_data = mm_pco_get_data (pco, &pco_data_size);
g_assert (pco_data != NULL); g_assert (pco_data != NULL);
g_assert_cmpuint (pco_data_size, ==, good_pco_infos[i].pco_data_size); g_assert_cmpuint (pco_data_size, ==, good_pco_infos[i].pco_data_size);
g_assert_cmpmem (pco_data, pco_data_size, g_assert_cmpint (memcmp (pco_data, good_pco_infos[i].pco_data, pco_data_size), ==, 0);
good_pco_infos[i].pco_data, good_pco_infos[i].pco_data_size);
g_object_unref (pco); g_object_unref (pco);
} }