|
 |
ae01a03 |
From b25d01246371ba0688fee6baa718e50c22d861c2 Mon Sep 17 00:00:00 2001
|
|
|
ae01a03 |
From: Martin Pitt <martinpitt@gnome.org>
|
|
|
ae01a03 |
Date: Wed, 15 Jan 2014 08:36:47 +0100
|
|
|
ae01a03 |
Subject: [PATCH 04/12] Fix unit test failure if $XDG_DATA_DIRS is not set
|
|
|
ae01a03 |
|
|
|
ae01a03 |
In that case g_setenv() would fail trying to set a NULL value in teardown.
|
|
|
ae01a03 |
|
|
|
ae01a03 |
https://bugs.freedesktop.org/show_bug.cgi?id=73651
|
|
|
ae01a03 |
|
|
|
ae01a03 |
Signed-off-by: Seif Lotfy <seif@lotfy.com>
|
|
|
ae01a03 |
---
|
|
|
ae01a03 |
test/c/test-datasource.c | 3 ++-
|
|
|
ae01a03 |
test/c/test-event.c | 3 ++-
|
|
|
ae01a03 |
2 files changed, 4 insertions(+), 2 deletions(-)
|
|
|
ae01a03 |
|
|
|
ae01a03 |
diff --git a/test/c/test-datasource.c b/test/c/test-datasource.c
|
|
|
ae01a03 |
index 067da55..3e3ce01 100644
|
|
|
ae01a03 |
--- a/test/c/test-datasource.c
|
|
|
ae01a03 |
+++ b/test/c/test-datasource.c
|
|
|
ae01a03 |
@@ -42,7 +42,8 @@ setup (Fixture *fix, gconstpointer data)
|
|
|
ae01a03 |
static void
|
|
|
ae01a03 |
teardown (Fixture *fix, gconstpointer data)
|
|
|
ae01a03 |
{
|
|
|
ae01a03 |
- g_setenv ("XDG_DATA_DIRS", old_xdg_data_dirs, TRUE);
|
|
|
ae01a03 |
+ if (old_xdg_data_dirs != NULL)
|
|
|
ae01a03 |
+ g_setenv ("XDG_DATA_DIRS", old_xdg_data_dirs, TRUE);
|
|
|
ae01a03 |
}
|
|
|
ae01a03 |
|
|
|
ae01a03 |
static void
|
|
|
ae01a03 |
diff --git a/test/c/test-event.c b/test/c/test-event.c
|
|
|
ae01a03 |
index 440d3c3..abd7718 100644
|
|
|
ae01a03 |
--- a/test/c/test-event.c
|
|
|
ae01a03 |
+++ b/test/c/test-event.c
|
|
|
ae01a03 |
@@ -42,7 +42,8 @@ setup (Fixture *fix, gconstpointer data)
|
|
|
ae01a03 |
static void
|
|
|
ae01a03 |
teardown (Fixture *fix, gconstpointer data)
|
|
|
ae01a03 |
{
|
|
|
ae01a03 |
- g_setenv ("XDG_DATA_DIRS", old_xdg_data_dirs, TRUE);
|
|
|
ae01a03 |
+ if (old_xdg_data_dirs != NULL)
|
|
|
ae01a03 |
+ g_setenv ("XDG_DATA_DIRS", old_xdg_data_dirs, TRUE);
|
|
|
ae01a03 |
}
|
|
|
ae01a03 |
|
|
|
ae01a03 |
static void
|
|
|
ae01a03 |
--
|
|
|
ae01a03 |
2.0.4
|
|
|
ae01a03 |
|