luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-02 07:23:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

GSettings tests: reverse installed test complexity

Browse Source 
Remove the complications that were introduced in an attempt to make the
gsettings and gschema-compile tests function as installed tests.  These
tests are designed (in large part for gsettings and entirely for
gschema-compile) to test the in-tree tools and should not be testing the
system versions.

In the future we may want to move the use of the in-tree tools from the
gsettings testcase into the Makefile and install the resulting files,
allowing this testcase to run against those files, installed.
This commit is contained in:
Ryan Lortie
2013-05-31 22:33:22 -04:00
parent f9eb9eed10
commit e042db0f83
2 changed files with 17 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gio/tests/gschema-compile.c
View File

@@ -5,8 +5,6 @@
#include <gio/gio.h>
#include <gstdio.h>
const gchar *glib_compile_schemas;
typedef struct {
const gchar *name;
const gchar *opt;
@@ -20,7 +18,7 @@ test_schema_do_compile (gpointer data)
gchar *filename = g_strconcat (test->name, ".gschema.xml", NULL);
gchar *path = g_test_build_filename (G_TEST_DIST, "schema-tests", filename, NULL);
gchar *argv[] = {
(gchar*)glib_compile_schemas,
"../glib-compile-schemas",
"--strict",
"--dry-run",
"--schema-file", path,
@@ -141,11 +139,6 @@ main (int argc, char *argv[])
setlocale (LC_ALL, "");
if (g_getenv ("GLIB_COMPILE_SCHEMAS"))
glib_compile_schemas = g_getenv ("GLIB_COMPILE_SCHEMAS");
else
glib_compile_schemas = "/usr/bin/glib-compile-schemas";
g_test_init (&argc, &argv, NULL);
for (i = 0; i < G_N_ELEMENTS (tests); ++i)