From b0133c1ed2308a1bcc830a0830fb276cc72c6e53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Voltz?= <stef.dev@free.fr>
Date: Tue, 1 Jul 2014 22:39:35 +0200
Subject: [PATCH] fix #314694

- make sanei_config testsuite handle out of source builds by using
  SANE_CONFIG_DIR
---
 ChangeLog                           | 4 ++++
 testsuite/sanei/sanei_config_test.c | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index bb59a7304..c7735e875 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-07-01 Stéphane Voltz <stef.dev@free.fr>
+	* testsuite/sanei/sanei_config_test.c: fix #314694 by exporting a
+	specific SANE_CONFIG_DIR env dir for tests
+
 2014-06-29 Stéphane Voltz <stef.dev@free.fr>
 	* backend/genesys_gl646.c: fix regression in coarse gain calibration
 
diff --git a/testsuite/sanei/sanei_config_test.c b/testsuite/sanei/sanei_config_test.c
index 9a07f2b36..3d1f5afc2 100644
--- a/testsuite/sanei/sanei_config_test.c
+++ b/testsuite/sanei/sanei_config_test.c
@@ -895,6 +895,9 @@ sanei_config_suite (void)
 int
 main (void)
 {
+  /* set up config dir for local conf files */
+  putenv("SANE_CONFIG_DIR=.:/");
+
   /* run suites */
   sanei_config_suite ();