From 19c7b50c94cc04e5a1849067e0001586633cec3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1n=20Tomko?= Date: Thu, 8 Oct 2020 13:50:00 +0200 Subject: [PATCH] tests: delete VIR_ALLOC tests cases MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There are no more users of VIR_ALLOC or VIR_ALLOC_N. Delete their test cases. Signed-off-by: Ján Tomko Reviewed-by: Pavel Hrdina --- tests/viralloctest.c | 73 +------------------------------------------- 1 file changed, 1 insertion(+), 72 deletions(-) diff --git a/tests/viralloctest.c b/tests/viralloctest.c index 785728d6f9..8ea98b8eca 100644 --- a/tests/viralloctest.c +++ b/tests/viralloctest.c @@ -43,73 +43,6 @@ testCheckNonNull(void *t) return 0; } -static int -testAllocScalar(const void *opaque G_GNUC_UNUSED) -{ - testDummyStruct *t; - int ret = -1; - - if (VIR_ALLOC(t) < 0) - return -1; - - if (testCheckNonNull(t) < 0) - goto cleanup; - - if (t->a != 0 || - t->b != 0) { - fprintf(stderr, "Allocated ram was not zerod\n"); - goto cleanup; - } - - VIR_FREE(t); - - if (t != NULL) { - fprintf(stderr, "Pointer is still set after free\n"); - goto cleanup; - } - - ret = 0; - cleanup: - VIR_FREE(t); - return ret; -} - - -static int -testAllocArray(const void *opaque G_GNUC_UNUSED) -{ - testDummyStruct *t; - size_t nt = 10, i; - int ret = -1; - - if (VIR_ALLOC_N(t, nt) < 0) - return -1; - - if (testCheckNonNull(t) < 0) - goto cleanup; - - for (i = 0; i < nt; i++) { - if (t[i].a != 0 || - t[i].b != 0) { - fprintf(stderr, "Allocated ram block %zu was not zerod\n", i); - goto cleanup; - } - } - - VIR_FREE(t); - - if (t != NULL) { - fprintf(stderr, "Pointer is still set after free\n"); - goto cleanup; - } - - ret = 0; - cleanup: - VIR_FREE(t); - return ret; -} - - static int testReallocArray(const void *opaque G_GNUC_UNUSED) { @@ -330,7 +263,7 @@ testInsertArray(const void *opaque G_GNUC_UNUSED) int ret = -1; testDummyStruct *n = (void *)0xff; - t = g_new0(testDummyStruct, nt); + t = g_new0(testDummyStruct *, nt); if (testCheckNonNull(t) < 0) goto cleanup; @@ -416,10 +349,6 @@ mymain(void) { int ret = 0; - if (virTestRun("alloc scalar", testAllocScalar, NULL) < 0) - ret = -1; - if (virTestRun("alloc array", testAllocArray, NULL) < 0) - ret = -1; if (virTestRun("realloc array", testReallocArray, NULL) < 0) ret = -1; if (virTestRun("expand array", testExpandArray, NULL) < 0)