[gnome-builder] build: fix make distcheck
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] build: fix make distcheck
- Date: Tue, 24 Mar 2015 07:27:30 +0000 (UTC)
commit 9d06aee8ce5acd4d3c5e22d694d6ecd456558107
Author: Christian Hergert <christian hergert me>
Date: Tue Mar 24 00:26:31 2015 -0700
build: fix make distcheck
src/gnome-builder.mk | 1 +
tests/test-ide-back-forward-list.c | 4 +++-
tests/test-ide-buffer-manager.c | 9 +++++++--
tests/test-ide-buffer.c | 4 +++-
tests/test-ide-context.c | 4 +++-
tests/tests.mk | 1 +
6 files changed, 18 insertions(+), 5 deletions(-)
---
diff --git a/src/gnome-builder.mk b/src/gnome-builder.mk
index e2f49c3..5974e76 100644
--- a/src/gnome-builder.mk
+++ b/src/gnome-builder.mk
@@ -218,6 +218,7 @@ BUILT_SOURCES += $(gnome_builder_built_sources)
EXTRA_DIST += $(resource_files)
EXTRA_DIST += src/resources/gnome-builder.gresource.xml
EXTRA_DIST += $(gnome_builder_built_sources)
+EXTRA_DIST += $(disabled_files)
DISTCLEANFILES += $(gnome_builder_built_sources)
diff --git a/tests/test-ide-back-forward-list.c b/tests/test-ide-back-forward-list.c
index 361147f..469bcb1 100644
--- a/tests/test-ide-back-forward-list.c
+++ b/tests/test-ide-back-forward-list.c
@@ -145,8 +145,10 @@ test_basic (void)
{
test_state_t state = { 0 };
GFile *project_file;
+ g_autofree gchar *path = NULL;
- project_file = g_file_new_for_path (TEST_DATA_DIR"/project1/configure.ac");
+ path = g_build_filename (g_get_current_dir (), TEST_DATA_DIR, "project1", "configure.ac", NULL);
+ project_file = g_file_new_for_path (path);
state.main_loop = g_main_loop_new (NULL, FALSE);
state.cancellable = g_cancellable_new ();
diff --git a/tests/test-ide-buffer-manager.c b/tests/test-ide-buffer-manager.c
index 643bef9..b292563 100644
--- a/tests/test-ide-buffer-manager.c
+++ b/tests/test-ide-buffer-manager.c
@@ -118,6 +118,7 @@ test_buffer_manager_basic_cb1 (GObject *object,
g_autoptr(IdeProgress) progress = NULL;
IdeBufferManager *buffer_manager;
IdeProject *project;
+ g_autofree gchar *path = NULL;
state->context = ide_context_new_finish (result, &state->error);
@@ -130,7 +131,9 @@ test_buffer_manager_basic_cb1 (GObject *object,
g_signal_connect (buffer_manager, "buffer-loaded", G_CALLBACK (buffer_loaded_cb), state);
project = ide_context_get_project (state->context);
- file = ide_project_get_file_for_path (project, TEST_DATA_DIR"/project1/configure.ac");
+
+ path = g_build_filename (g_get_current_dir (), TEST_DATA_DIR, "project1", "configure.ac", NULL);
+ file = ide_project_get_file_for_path (project, path);
ide_buffer_manager_load_file_async (buffer_manager,
file,
@@ -154,8 +157,10 @@ test_buffer_manager_basic (void)
test_buffer_manager_basic_state state = { 0 };
IdeBufferManager *buffer_manager;
GFile *project_file;
+ g_autofree gchar *path = NULL;
- project_file = g_file_new_for_path (TEST_DATA_DIR"/project1/configure.ac");
+ path = g_build_filename (g_get_current_dir (), TEST_DATA_DIR, "project1", "configure.ac", NULL);
+ project_file = g_file_new_for_path (path);
state.main_loop = g_main_loop_new (NULL, FALSE);
state.cancellable = g_cancellable_new ();
diff --git a/tests/test-ide-buffer.c b/tests/test-ide-buffer.c
index aa59288..f0d77f9 100644
--- a/tests/test-ide-buffer.c
+++ b/tests/test-ide-buffer.c
@@ -111,8 +111,10 @@ test_buffer_basic (void)
test_buffer_basic_state state = { 0 };
IdeBufferManager *manager;
GFile *project_file;
+ g_autofree gchar *path = NULL;
- project_file = g_file_new_for_path (TEST_DATA_DIR"/project1/configure.ac");
+ path = g_build_filename (g_get_current_dir (), TEST_DATA_DIR, "project1", "configure.ac", NULL);
+ project_file = g_file_new_for_path (path);
state.main_loop = g_main_loop_new (NULL, FALSE);
state.cancellable = g_cancellable_new ();
diff --git a/tests/test-ide-context.c b/tests/test-ide-context.c
index 1b362dc..37b026c 100644
--- a/tests/test-ide-context.c
+++ b/tests/test-ide-context.c
@@ -46,8 +46,10 @@ test_new_async (void)
IdeVcs *vcs;
GFile *project_file;
const gchar *root_build_dir;
+ g_autofree gchar *path = NULL;
- project_file = g_file_new_for_path (TEST_DATA_DIR"/project1/configure.ac");
+ path = g_build_filename (g_get_current_dir (), TEST_DATA_DIR, "project1", "configure.ac", NULL);
+ project_file = g_file_new_for_path (path);
state.main_loop = g_main_loop_new (NULL, FALSE);
state.cancellable = g_cancellable_new ();
diff --git a/tests/tests.mk b/tests/tests.mk
index 0962d15..3aa7377 100644
--- a/tests/tests.mk
+++ b/tests/tests.mk
@@ -50,4 +50,5 @@ test_ide_source_view_LDADD = libide-1.0.la $(LIBIDE_LIBS)
EXTRA_DIST += \
tests/data/project1/configure.ac \
+ tests/tests.h \
$(NULL)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]