[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH] tests: avoid littering /tmp



Running 'make -C tests check TESTS=qemuagenttest' left a directory
/tmp/libvirt_XXXXXX/ behind.  The culprit was failure to cleanup
when short-circuiting an expensive test.

* tests/qemuagenttest.c (testQemuAgentTimeout): Free resources
when skipping expensive test.

Signed-off-by: Eric Blake <eblake redhat com>
---

Pushing under the trivial rule.

 tests/qemuagenttest.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tests/qemuagenttest.c b/tests/qemuagenttest.c
index 7a49b0b..b5bcbe3 100644
--- a/tests/qemuagenttest.c
+++ b/tests/qemuagenttest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Red Hat, Inc.
+ * Copyright (C) 2013, 2014 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -538,8 +538,10 @@ testQemuAgentTimeout(const void *data)
     if (!test)
         return -1;

-    if (virTestGetExpensive() == 0)
-        return EXIT_AM_SKIP;
+    if (virTestGetExpensive() == 0) {
+        ret = EXIT_AM_SKIP;
+        goto cleanup;
+    }

     if (qemuMonitorTestAddHandler(test, qemuAgentTimeoutTestMonitorHandler,
                                   NULL, NULL) < 0)
-- 
1.8.5.3


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]