From 84494d2e0a71944cf86ad7d2aa0b786f9e76112e Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Thu, 29 May 2008 19:41:40 +0000 Subject: [PATCH] Fix warning with OOM testing is disabled --- ChangeLog | 4 ++++ tests/testutils.c | 9 ++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 530af890ce..3f143e5744 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Thu May 29 15:41:00 EST 2008 Daniel P. Berrange + + * tests/testutils.c: Fix warning when OOM testing is disabled + Thu May 29 15:25:00 EST 2008 Daniel P. Berrange * configure.in, scripts/*: Remove all coverage helper scripts diff --git a/tests/testutils.c b/tests/testutils.c index 6eea4981ff..d998d1fdf4 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -287,15 +287,17 @@ int virtTestDifference(FILE *stream, return 0; } +#if TEST_OOM static void virtTestErrorFuncQuiet(void *data ATTRIBUTE_UNUSED, virErrorPtr err ATTRIBUTE_UNUSED) { } +#endif +#if TEST_OOM_TRACE static void virtTestErrorHook(int n, void *data ATTRIBUTE_UNUSED) { -#if TEST_OOM_TRACE void *trace[30]; int ntrace = ARRAY_CARDINALITY(trace); int i; @@ -311,8 +313,8 @@ virtTestErrorHook(int n, void *data ATTRIBUTE_UNUSED) } free(symbols); } -#endif } +#endif int virtTestMain(int argc, @@ -352,9 +354,10 @@ int virtTestMain(int argc, if (ret != EXIT_SUCCESS) return EXIT_FAILURE; +#if TEST_OOM_TRACE if (testDebug) virAllocTestHook(virtTestErrorHook, NULL); - +#endif if (testOOM) { /* Makes next test runs quiet... */