Attachment 113415 Details for Bug 61303 – loopback test: cope with being run without XDG_RUNTIME_DIR

[patch] loopback test: cope with being run without XDG_RUNTIME_DIR

0001-loopback-test-cope-with-being-run-without-XDG_RUNTIM.patch (text/plain), 1.37 KB, created by Simon McVittie on 2015-02-12 17:52:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2015-02-12 17:52:05 UTC

Size: 1.37 KB

patch

obsolete

>From d936c862cf93b2974a6ddfaf7a7e78f9b01261f6 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Thu, 12 Feb 2015 17:48:43 +0000
>Subject: [PATCH] loopback test: cope with being run without XDG_RUNTIME_DIR
>
>This could happen during installed-tests.
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=61303
>---
> test/loopback.c | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
>diff --git a/test/loopback.c b/test/loopback.c
>index 18ca588..9af31dc 100644
>--- a/test/loopback.c
>+++ b/test/loopback.c
>@@ -315,7 +315,10 @@ teardown_no_runtime (Fixture *f,
>   teardown (f, addr);
> 
>   /* we're relying on being single-threaded for this to be safe */
>-  g_setenv ("XDG_RUNTIME_DIR", f->saved_runtime_dir, TRUE);
>+  if (f->saved_runtime_dir == NULL)
>+    g_setenv ("XDG_RUNTIME_DIR", f->saved_runtime_dir, TRUE);
>+  else
>+    g_unsetenv ("XDG_RUNTIME_DIR");
>   g_free (f->saved_runtime_dir);
> }
> 
>@@ -335,7 +338,10 @@ teardown_runtime (Fixture *f,
>   g_assert_cmpint (g_rmdir (f->tmp_runtime_dir), ==, 0);
> 
>   /* we're relying on being single-threaded for this to be safe */
>-  g_setenv ("XDG_RUNTIME_DIR", f->saved_runtime_dir, TRUE);
>+  if (f->saved_runtime_dir == NULL)
>+    g_setenv ("XDG_RUNTIME_DIR", f->saved_runtime_dir, TRUE);
>+  else
>+    g_unsetenv ("XDG_RUNTIME_DIR");
>   g_free (f->saved_runtime_dir);
>   g_free (f->tmp_runtime_dir);
> }
>-- 
>2.1.4
>

Actions: View | Splinter Review

Attachments on bug 61303: 75347 | 75348 | 75349 | 75350 | 75351 | 75352 | 89097 | 91550 | 91551 | 111959 | 111960 | 112940 | 112942 | 112943 | 113366 | 113367 | 113401 | 113402 | 113415 | 113417 | 113759

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.