GNOME.org
 

[libgda/LIBGDA_4.2] Removed warning during "make check"

commit af170f0f90aecf6ea1cb0a723bef240a90fd9c84
Author: Vivien Malerba <malerba gnome-db org>
Date:   Wed Mar 30 18:40:39 2011 +0200

    Removed warning during "make check"

 libgda/gda-config.c                            |    5 ++++-
 libgda/gda-init.c                              |    2 +-
 libgda/gda-meta-store.c                        |    8 ++++----
 tests/Makefile.am                              |    2 ++
 tests/data-models/Makefile.am                  |    5 ++---
 tests/data-models/check_data_proxy.c           |    3 ---
 tests/data-models/check_model_errors.c         |    3 ---
 tests/data-models/check_pmodel.c               |    3 ---
 tests/data-models/check_vcnc.c                 |    3 ---
 tests/data-models/check_virtual.c              |    3 ---
 tests/meta-store/Makefile.am                   |    4 ++--
 tests/meta-store/check_meta_store_memory.c     |    3 ---
 tests/meta-store/check_meta_store_mysql.c      |    5 +----
 tests/meta-store/check_meta_store_postgresql.c |    3 ---
 tests/meta-store/check_meta_store_sqlite.c     |    3 ---
 tests/multi-threading/Makefile.am              |    4 ++--
 tests/multi-threading/check_cnc_lock.c         |    4 ----
 tests/multi-threading/check_threaded_cnc.c     |    3 ---
 tests/parser/Makefile.am                       |    9 +++++----
 tests/parser/check_dml_comp.c                  |    3 ---
 tests/parser/check_normalization.c             |    3 ---
 tests/parser/check_validation.c                |    3 ---
 tests/providers/Makefile.am                    |    4 ++--
 tests/providers/check_bdb.c                    |    2 --
 tests/providers/check_firebird.c               |    2 --
 tests/providers/check_mdb.c                    |    2 --
 tests/providers/check_mysql.c                  |    2 --
 tests/providers/check_oracle.c                 |    2 --
 tests/providers/check_postgres.c               |    2 --
 tests/providers/check_sqlite.c                 |    2 --
 tests/test-ddl-creator.c                       |    3 +--
 tests/test-identifiers-quotes.c                |    8 +++++---
 tests/value-holders/Makefile.am                |    1 +
 33 files changed, 32 insertions(+), 82 deletions(-)
---
diff --git a/libgda/gda-config.c b/libgda/gda-config.c
index 5c988aa..9f5c400 100644
--- a/libgda/gda-config.c
+++ b/libgda/gda-config.c
@@ -1,4 +1,4 @@
-/* GDA library
+/*
  * Copyright (C) 2007 - 2011 The GNOME Foundation.
  *
  * AUTHORS:
@@ -284,6 +284,9 @@ load_config_file (const gchar *file, gboolean is_system)
 	xmlDocPtr doc;
 	xmlNodePtr root;
 
+	if (!g_file_test (file, G_FILE_TEST_EXISTS))
+		return;
+
 	doc = xmlParseFile (file);
 	if (!doc) 
 		return;
diff --git a/libgda/gda-init.c b/libgda/gda-init.c
index ef89a35..0dd9ca7 100644
--- a/libgda/gda-init.c
+++ b/libgda/gda-init.c
@@ -1,4 +1,4 @@
-/* GDA Library
+/*
  * Copyright (C) 1998 - 2008 The GNOME Foundation.
  *
  * This Library is free software; you can redistribute it and/or
diff --git a/libgda/gda-meta-store.c b/libgda/gda-meta-store.c
index a4b0b91..a342d9f 100644
--- a/libgda/gda-meta-store.c
+++ b/libgda/gda-meta-store.c
@@ -1,5 +1,4 @@
-/* gda-meta-store.c
- *
+/*
  * Copyright (C) 2008 - 2011 Vivien Malerba
  *
  * This Library is free software; you can redistribute it and/or
@@ -1096,11 +1095,12 @@ create_db_objects (GdaMetaStoreClass *klass, GdaMetaStore *store)
 	GError *lerror = NULL;
 	GError **error = &lerror;
 	gchar *file;
-	xmlDocPtr doc;
+	xmlDocPtr doc = NULL;
 
 	/* load information schema's structure XML file */
 	file = gda_gbr_get_file_path (GDA_DATA_DIR, LIBGDA_ABI_NAME, "information_schema.xml", NULL);
-	doc = xmlParseFile (file);
+	if (g_file_test (file, G_FILE_TEST_EXISTS))
+		doc = xmlParseFile (file);
 	if (!doc) {
 		if (g_getenv ("GDA_TOP_SRC_DIR")) {
 			g_free (file);
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8eb45b7..9748a6c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,6 @@
 noinst_LTLIBRARIES = libgda-test-4.0.la
+
+TESTS_ENVIRONMENT = GDA_TOP_SRC_DIR="$(abs_top_srcdir)" GDA_TOP_BUILD_DIR="$(abs_top_builddir)"
 TESTS = test-ddl-creator test-bin-converter test-sql-identifier test-identifiers-quotes test-sql-builder test-connection-string-split test-input-parsers
 check_PROGRAMS = test-ddl-creator test-bin-converter test-sql-identifier test-identifiers-quotes test-sql-builder test-connection-string-split test-input-parsers
 
diff --git a/tests/data-models/Makefile.am b/tests/data-models/Makefile.am
index fec0bd6..2b1608c 100644
--- a/tests/data-models/Makefile.am
+++ b/tests/data-models/Makefile.am
@@ -4,10 +4,9 @@ AM_CPPFLAGS = \
 	-I$(top_builddir) \
 	$(LIBGDA_CFLAGS) \
 	$(LIBGDA_WFLAGS) \
-	-DCHECK_FILES=\""$(top_srcdir)"\" \
-	-DTOP_SRC_DIR=\""$(top_srcdir)"\" \
-	-DTOP_BUILD_DIR=\""$(top_builddir)"\"
+	-DCHECK_FILES=\""$(top_srcdir)"\"
 
+TESTS_ENVIRONMENT = GDA_TOP_SRC_DIR="$(abs_top_srcdir)" GDA_TOP_BUILD_DIR="$(abs_top_builddir)"
 check_PROGRAMS = check_model_import check_virtual check_data_proxy check_model_copy check_pmodel check_empty_rs check_model_errors check_vcnc
 TESTS = check_model_import check_virtual check_data_proxy check_model_copy check_pmodel check_empty_rs check_model_errors check_vcnc
 
diff --git a/tests/data-models/check_data_proxy.c b/tests/data-models/check_data_proxy.c
index 857f1d1..8aee2c3 100644
--- a/tests/data-models/check_data_proxy.c
+++ b/tests/data-models/check_data_proxy.c
@@ -55,9 +55,6 @@ main (int argc, char **argv)
 {
 	int number_failed = 0;
 
-	/* set up test environment */
-        g_setenv ("GDA_TOP_BUILD_DIR", TOP_BUILD_DIR, 0);
-        g_setenv ("GDA_TOP_SRC_DIR", TOP_SRC_DIR, TRUE);
 	gda_init ();
 
 	prepend_null_row = FALSE;
diff --git a/tests/data-models/check_model_errors.c b/tests/data-models/check_model_errors.c
index f471092..0270b3e 100644
--- a/tests/data-models/check_model_errors.c
+++ b/tests/data-models/check_model_errors.c
@@ -29,9 +29,6 @@ main (int argc, char **argv)
 {
 	gint i, ntests = 0, number_failed = 0;
 
-	/* set up test environment */
-        g_setenv ("GDA_TOP_BUILD_DIR", TOP_BUILD_DIR, 0);
-	g_setenv ("GDA_TOP_SRC_DIR", TOP_SRC_DIR, TRUE);
 	gda_init ();
 	
 	for (i = 0; i < sizeof (tests) / sizeof (TestFunc); i++) {
diff --git a/tests/data-models/check_pmodel.c b/tests/data-models/check_pmodel.c
index 02f780a..c343f59 100644
--- a/tests/data-models/check_pmodel.c
+++ b/tests/data-models/check_pmodel.c
@@ -88,9 +88,6 @@ main (int argc, char **argv)
 	gint i, ntests = 0, number_failed = 0;
 	GdaConnection *cnc;
 
-	/* set up test environment */
-        g_setenv ("GDA_TOP_BUILD_DIR", TOP_BUILD_DIR, 0);
-	g_setenv ("GDA_TOP_SRC_DIR", TOP_SRC_DIR, TRUE);
 	gda_init ();
 
 	g_unlink ("pmodel.db");
diff --git a/tests/data-models/check_vcnc.c b/tests/data-models/check_vcnc.c
index b70ec35..fb34c23 100644
--- a/tests/data-models/check_vcnc.c
+++ b/tests/data-models/check_vcnc.c
@@ -35,9 +35,6 @@ main (int argc, char *argv[])
 	GdaVirtualProvider *provider;
 	gchar *file;
 	
-	/* set up test environment */
-        g_setenv ("GDA_TOP_BUILD_DIR", TOP_BUILD_DIR, 0);
-        g_setenv ("GDA_TOP_SRC_DIR", TOP_SRC_DIR, TRUE);
 	gda_init ();
 
 	provider = gda_vprovider_hub_new ();
diff --git a/tests/data-models/check_virtual.c b/tests/data-models/check_virtual.c
index 6a0b051..9ef2c44 100644
--- a/tests/data-models/check_virtual.c
+++ b/tests/data-models/check_virtual.c
@@ -16,9 +16,6 @@ main (int argc, char **argv)
 	GdaDataModel *rw_model;
 	gchar *file;
 	
-	/* set up test environment */
-        g_setenv ("GDA_TOP_BUILD_DIR", TOP_BUILD_DIR, 0);
-        g_setenv ("GDA_TOP_SRC_DIR", TOP_SRC_DIR, TRUE);
 	gda_init ();
 
 	provider = gda_vprovider_data_model_new ();
diff --git a/tests/meta-store/Makefile.am b/tests/meta-store/Makefile.am
index 4bf5da8..f9a8a8d 100644
--- a/tests/meta-store/Makefile.am
+++ b/tests/meta-store/Makefile.am
@@ -4,9 +4,9 @@ AM_CPPFLAGS = \
 	-I$(top_builddir) \
 	$(LIBGDA_CFLAGS) \
 	$(LIBGDA_WFLAGS) \
-	-DTOP_SRC_DIR=\""$(top_srcdir)"\" \
-	-DTOP_BUILD_DIR=\""$(top_builddir)"\"
+	-DTOP_SRC_DIR=\""$(top_srcdir)"\"
 
+TESTS_ENVIRONMENT = GDA_TOP_SRC_DIR="$(abs_top_srcdir)" GDA_TOP_BUILD_DIR="$(abs_top_builddir)"
 TESTS = check_meta_store_memory check_meta_store_sqlite check_meta_store_postgresql check_meta_store_mysql
 check_PROGRAMS = check_meta_store_memory check_meta_store_sqlite check_meta_store_postgresql check_meta_store_mysql
 
diff --git a/tests/meta-store/check_meta_store_memory.c b/tests/meta-store/check_meta_store_memory.c
index 4e8d056..c1843ff 100644
--- a/tests/meta-store/check_meta_store_memory.c
+++ b/tests/meta-store/check_meta_store_memory.c
@@ -8,9 +8,6 @@ main (int argc, char ** argv)
 {
 	GdaMetaStore *store;
 
-	/* set up test environment */
-	g_setenv ("GDA_TOP_SRC_DIR", TOP_SRC_DIR, TRUE);
-	g_setenv ("GDA_TOP_BUILD_DIR", TOP_BUILD_DIR, TRUE);
 	gda_init ();
 
 	/* Clean eveything which might exist in the store */
diff --git a/tests/meta-store/check_meta_store_mysql.c b/tests/meta-store/check_meta_store_mysql.c
index 5794d3d..8aea70a 100644
--- a/tests/meta-store/check_meta_store_mysql.c
+++ b/tests/meta-store/check_meta_store_mysql.c
@@ -8,10 +8,7 @@ main(int argc, char ** argv)
 {
 	GdaMetaStore *store;
 	gchar *cnc_string;
-	
-	/* set up test environment */
-	g_setenv ("GDA_TOP_SRC_DIR", TOP_SRC_DIR, TRUE);
-	g_setenv ("GDA_TOP_BUILD_DIR", TOP_BUILD_DIR, TRUE);
+
 	gda_init ();
 
 	/* connection parameters */
diff --git a/tests/meta-store/check_meta_store_postgresql.c b/tests/meta-store/check_meta_store_postgresql.c
index 57abe43..edc63b1 100644
--- a/tests/meta-store/check_meta_store_postgresql.c
+++ b/tests/meta-store/check_meta_store_postgresql.c
@@ -9,9 +9,6 @@ main(int argc, char ** argv)
 	GdaMetaStore *store;
 	gchar *cnc_string;
 	
-	/* set up test environment */
-	g_setenv ("GDA_TOP_SRC_DIR", TOP_SRC_DIR, TRUE);
-	g_setenv ("GDA_TOP_BUILD_DIR", TOP_BUILD_DIR, TRUE);
 	gda_init ();
 
 	/* connection parameters */
diff --git a/tests/meta-store/check_meta_store_sqlite.c b/tests/meta-store/check_meta_store_sqlite.c
index 6e1f3a0..db0a9ff 100644
--- a/tests/meta-store/check_meta_store_sqlite.c
+++ b/tests/meta-store/check_meta_store_sqlite.c
@@ -8,9 +8,6 @@ main(int argc, char ** argv)
 {
 	GdaMetaStore *store;
 
-	/* set up test environment */
-	g_setenv ("GDA_TOP_SRC_DIR", TOP_SRC_DIR, TRUE);
-	g_setenv ("GDA_TOP_BUILD_DIR", TOP_BUILD_DIR, TRUE);
 	gda_init ();
 
 	/* Clean eveything which might exist in the store */
diff --git a/tests/multi-threading/Makefile.am b/tests/multi-threading/Makefile.am
index f595884..3422d76 100644
--- a/tests/multi-threading/Makefile.am
+++ b/tests/multi-threading/Makefile.am
@@ -4,9 +4,9 @@ AM_CPPFLAGS = \
 	-I$(top_builddir) \
 	$(LIBGDA_CFLAGS) \
 	$(LIBGDA_WFLAGS) \
-	-DROOT_DIR=\""$(top_srcdir)"\" \
-	-DTOP_BUILD_DIR=\""$(top_builddir)"\"
+	-DROOT_DIR=\""$(top_srcdir)"\"
 
+TESTS_ENVIRONMENT = GDA_TOP_SRC_DIR="$(abs_top_srcdir)" GDA_TOP_BUILD_DIR="$(abs_top_builddir)"
 TESTS = check_mutex check_parser check_cnc_lock check_threaded_cnc check_wrapper
 check_PROGRAMS = check_mutex check_parser check_cnc_lock check_threaded_cnc check_wrapper
 
diff --git a/tests/multi-threading/check_cnc_lock.c b/tests/multi-threading/check_cnc_lock.c
index 6ce5f97..972fb3e 100644
--- a/tests/multi-threading/check_cnc_lock.c
+++ b/tests/multi-threading/check_cnc_lock.c
@@ -26,10 +26,6 @@ main (int argc, char** argv)
 	gchar *fname;
 	GError *error = NULL;
 
-	/* set up test environment */
-        g_setenv ("GDA_TOP_BUILD_DIR", TOP_BUILD_DIR, 0);
-	g_setenv ("GDA_TOP_SRC_DIR", ROOT_DIR, 0);
-
 	g_type_init ();
 	gda_init ();
 
diff --git a/tests/multi-threading/check_threaded_cnc.c b/tests/multi-threading/check_threaded_cnc.c
index 5988012..9e36bb4 100644
--- a/tests/multi-threading/check_threaded_cnc.c
+++ b/tests/multi-threading/check_threaded_cnc.c
@@ -28,9 +28,6 @@ main (int argc, char** argv)
 	gint ntests = 0;
 	gchar *fname;
 
-	/* set up test environment */
-        g_setenv ("GDA_TOP_BUILD_DIR", TOP_BUILD_DIR, 0);
-        g_setenv ("GDA_TOP_SRC_DIR", ROOT_DIR, 0);
         gda_init ();
 
 	/* create test DB */
diff --git a/tests/parser/Makefile.am b/tests/parser/Makefile.am
index acc8e81..807530e 100644
--- a/tests/parser/Makefile.am
+++ b/tests/parser/Makefile.am
@@ -4,10 +4,9 @@ AM_CPPFLAGS = \
 	-I$(top_builddir) \
 	$(LIBGDA_CFLAGS) \
 	$(LIBGDA_WFLAGS) \
-	-DROOT_DIR=\""$(top_srcdir)"\"  \
-	-DTOP_BUILD_DIR=\""$(top_builddir)"\" \
-	-DTOP_SRC_DIR=\""$(top_srcdir)"\"
+	-DROOT_DIR=\""$(top_srcdir)"\"
 
+TESTS_ENVIRONMENT = GDA_TOP_SRC_DIR="$(abs_top_srcdir)" GDA_TOP_BUILD_DIR="$(abs_top_builddir)"
 TESTS = check_parser check_validation check_normalization check_dml_comp check_script check_rewrite_for_default
 check_PROGRAMS = check_parser check_validation check_normalization check_dml_comp check_script check_rewrite_for_default
 
@@ -44,4 +43,6 @@ check_rewrite_for_default_LDADD = \
 
 EXTRA_DIST = testdata.xml testvalid.xml testscripts.xml \
 	scripts/mysql_employees.sql \
-	scripts/mysql_employees_partitioned.sql
+	scripts/mysql_employees_partitioned.sql \
+	scripts/piggydb.sql \
+	scripts/e-venement.sql
diff --git a/tests/parser/check_dml_comp.c b/tests/parser/check_dml_comp.c
index c851173..47906c5 100644
--- a/tests/parser/check_dml_comp.c
+++ b/tests/parser/check_dml_comp.c
@@ -25,9 +25,6 @@ main (int argc, char** argv)
 	gint ntests = 0;
 	gchar *fname;
 
-	/* set up test environment */
-        g_setenv ("GDA_TOP_BUILD_DIR", TOP_BUILD_DIR, 0);
-        g_setenv ("GDA_TOP_SRC_DIR", TOP_SRC_DIR, 0);
 	gda_init ();
 
 	/* open connection */
diff --git a/tests/parser/check_normalization.c b/tests/parser/check_normalization.c
index 7dfaf24..7df5291 100644
--- a/tests/parser/check_normalization.c
+++ b/tests/parser/check_normalization.c
@@ -24,9 +24,6 @@ main (int argc, char** argv)
 	gint ntests = 0;
 	gchar *fname;
 
-	/* set up test environment */
-        g_setenv ("GDA_TOP_BUILD_DIR", TOP_BUILD_DIR, 0);
-        g_setenv ("GDA_TOP_SRC_DIR", TOP_SRC_DIR, 0);
 	gda_init ();
 
 	/* open connection */
diff --git a/tests/parser/check_validation.c b/tests/parser/check_validation.c
index c1786b3..4153454 100644
--- a/tests/parser/check_validation.c
+++ b/tests/parser/check_validation.c
@@ -24,9 +24,6 @@ main (int argc, char** argv)
 	gint ntests = 0;
 	gchar *fname;
 
-	/* set up test environment */
-        g_setenv ("GDA_TOP_BUILD_DIR", TOP_BUILD_DIR, 0);
-        g_setenv ("GDA_TOP_SRC_DIR", TOP_SRC_DIR, 0);
 	gda_init ();
 
 	/* open connection */
diff --git a/tests/providers/Makefile.am b/tests/providers/Makefile.am
index 784b60e..219cb89 100644
--- a/tests/providers/Makefile.am
+++ b/tests/providers/Makefile.am
@@ -4,9 +4,9 @@ AM_CPPFLAGS = \
 	-I$(top_builddir) \
 	$(LIBGDA_CFLAGS) \
 	$(LIBGDA_WFLAGS) \
-	-DCHECK_SQL_FILES=\""$(top_srcdir)"\" \
-	-DTOP_BUILD_DIR=\""$(top_builddir)"\"
+	-DCHECK_SQL_FILES=\""$(top_srcdir)"\"
 
+TESTS_ENVIRONMENT = GDA_TOP_SRC_DIR="$(abs_top_srcdir)" GDA_TOP_BUILD_DIR="$(abs_top_builddir)"
 check_PROGRAMS = check_sqlite
 TESTS = check_sqlite
 
diff --git a/tests/providers/check_bdb.c b/tests/providers/check_bdb.c
index 30b31fc..5962368 100644
--- a/tests/providers/check_bdb.c
+++ b/tests/providers/check_bdb.c
@@ -13,8 +13,6 @@ main (int argc, char **argv)
 {
 	int number_failed = 0;
 
-	/* set up test environment */
-	g_setenv ("GDA_TOP_BUILD_DIR", TOP_BUILD_DIR, 0);
 	gda_init ();
 
 	pinfo = gda_config_get_provider_info (PROVIDER);
diff --git a/tests/providers/check_firebird.c b/tests/providers/check_firebird.c
index ef6991b..3e51231 100644
--- a/tests/providers/check_firebird.c
+++ b/tests/providers/check_firebird.c
@@ -13,8 +13,6 @@ main (int argc, char **argv)
 {
 	int number_failed = 0;
 
-	/* set up test environment */
-	g_setenv ("GDA_TOP_BUILD_DIR", TOP_BUILD_DIR, 0);
 	gda_init ();
 
 	pinfo = gda_config_get_provider_info (PROVIDER);
diff --git a/tests/providers/check_mdb.c b/tests/providers/check_mdb.c
index 52be8b0..7065f47 100644
--- a/tests/providers/check_mdb.c
+++ b/tests/providers/check_mdb.c
@@ -13,8 +13,6 @@ main (int argc, char **argv)
 {
 	int number_failed = 0;
 
-	/* set up test environment */
-	g_setenv ("GDA_TOP_BUILD_DIR", TOP_BUILD_DIR, 0);
 	gda_init ();
 
 	pinfo = gda_config_get_provider_info (PROVIDER);
diff --git a/tests/providers/check_mysql.c b/tests/providers/check_mysql.c
index beeb517..8ad9f86 100644
--- a/tests/providers/check_mysql.c
+++ b/tests/providers/check_mysql.c
@@ -13,8 +13,6 @@ main (int argc, char **argv)
 {
 	int number_failed = 0;
 
-	/* set up test environment */
-	g_setenv ("GDA_TOP_BUILD_DIR", TOP_BUILD_DIR, 0);
 	gda_init ();
 
 	pinfo = gda_config_get_provider_info (PROVIDER);
diff --git a/tests/providers/check_oracle.c b/tests/providers/check_oracle.c
index 5063af0..be2405b 100644
--- a/tests/providers/check_oracle.c
+++ b/tests/providers/check_oracle.c
@@ -13,8 +13,6 @@ main (int argc, char **argv)
 {
 	int number_failed = 0;
 
-	/* set up test environment */
-	g_setenv ("GDA_TOP_BUILD_DIR", TOP_BUILD_DIR, 0);
 	gda_init ();
 
 	pinfo = gda_config_get_provider_info (PROVIDER);
diff --git a/tests/providers/check_postgres.c b/tests/providers/check_postgres.c
index 2e596d0..3a5bf88 100644
--- a/tests/providers/check_postgres.c
+++ b/tests/providers/check_postgres.c
@@ -15,8 +15,6 @@ main (int argc, char **argv)
 	int number_failed = 0;
 	fork_tests = FALSE;
 
-	/* set up test environment */
-	g_setenv ("GDA_TOP_BUILD_DIR", TOP_BUILD_DIR, 0);
 	gda_init ();
 
 	pinfo = gda_config_get_provider_info (PROVIDER);
diff --git a/tests/providers/check_sqlite.c b/tests/providers/check_sqlite.c
index a0643a5..3bee438 100644
--- a/tests/providers/check_sqlite.c
+++ b/tests/providers/check_sqlite.c
@@ -15,8 +15,6 @@ main (int argc, char **argv)
 	int number_failed = 0;
 	fork_tests = FALSE;
 
-	/* set up test environment */
-	g_setenv ("GDA_TOP_BUILD_DIR", TOP_BUILD_DIR, 0);
 	gda_init ();
 
 	pinfo = gda_config_get_provider_info (PROVIDER);
diff --git a/tests/test-ddl-creator.c b/tests/test-ddl-creator.c
index db253b3..cb78433 100644
--- a/tests/test-ddl-creator.c
+++ b/tests/test-ddl-creator.c
@@ -20,6 +20,7 @@
  */
 
 #include <libgda/libgda.h>
+#include <glib/gstdio.h>
 #include <gda-ddl-creator.h>
 
 int
@@ -31,8 +32,6 @@ main (int argc, char** argv)
 	gchar *str;
 	gchar *file;
 
-	/* set up test environment */
-        g_setenv ("GDA_TOP_BUILD_DIR", TOP_BUILD_DIR, 0);
 	gda_init ();
 	
 	ddl = gda_ddl_creator_new ();
diff --git a/tests/test-identifiers-quotes.c b/tests/test-identifiers-quotes.c
index 4193fa8..ee28c9e 100644
--- a/tests/test-identifiers-quotes.c
+++ b/tests/test-identifiers-quotes.c
@@ -168,12 +168,14 @@ main (int argc, char** argv)
 		GdaServerProvider *prov = NULL;
 
 		if (test->provider) {
+			const gchar *real_pname;
 			if ((*test->provider == 'i') || (*test->provider == 's'))
-				prov = gda_config_get_provider (test->provider + 1, NULL);
+				real_pname = test->provider + 1;
 			else
-				prov = gda_config_get_provider (test->provider, NULL);
+				real_pname = test->provider;
+			prov = gda_config_get_provider (real_pname, NULL);
 			if (!prov) {
-				g_print ("Can't find provider for %s, ignoring test\n", test->provider);
+				g_print ("Can't find provider for %s, ignoring test\n", real_pname);
 				continue;
 			}
 			if (*test->provider == 'i')
diff --git a/tests/value-holders/Makefile.am b/tests/value-holders/Makefile.am
index 21c357a..b95b306 100644
--- a/tests/value-holders/Makefile.am
+++ b/tests/value-holders/Makefile.am
@@ -7,6 +7,7 @@ AM_CPPFLAGS = \
 	$(JSON_GLIB_CFLAGS) \
 	-DROOT_DIR=\""$(top_srcdir)"\"
 
+TESTS_ENVIRONMENT = GDA_TOP_SRC_DIR="$(abs_top_srcdir)" GDA_TOP_BUILD_DIR="$(abs_top_builddir)"
 TESTS = check_holder check_set check_statement
 check_PROGRAMS = check_holder check_set check_statement
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]