X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=util%2Ftstres.c;h=61f5dab0bdc001bdec0f3e6a2c29bcca9e343203;hp=f27b8293840a7b1633a3f6acd1bd68d32ff83237;hb=6c5467571389a21c91196ce1608945633c1cf92a;hpb=34cbac3d95d4115856ac1620911e51c7e056289c

diff --git a/util/tstres.c b/util/tstres.c
index f27b829..61f5dab 100644
--- a/util/tstres.c
+++ b/util/tstres.c
@@ -1,8 +1,5 @@
-/* $Id: tstres.c,v 1.1 2007-05-16 10:57:06 adam Exp $
-   Copyright (C) 1995-2007
-   Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) 1994-2011 Index Data
 
 Zebra is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -20,8 +17,25 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <string.h>
+#include <stdlib.h>
 #include <idzebra/res.h>
 #include <yaz/test.h>
+#include <yaz/snprintf.h>
+
+/* use env srcdir as base directory - or current directory if unset */
+const char *get_srcdir(void)
+{
+    const char *srcdir = getenv("srcdir");
+    if (!srcdir || ! *srcdir)
+        srcdir=".";
+    return srcdir;
+
+}
+
 
 static void tst_res_open(void)
 {
@@ -48,7 +62,11 @@ static void tst_res_read_file(void)
     if (res)
     {
         const char *v;
-        int r = res_read_file(res, "tstres.cfg");
+        char path[1024];
+        int r;
+        
+        yaz_snprintf(path, sizeof(path), "%s/tstres.cfg", get_srcdir());
+        r = res_read_file(res, path);
         YAZ_CHECK_EQ(r, ZEBRA_OK);
 
         v = res_get_def(res, "register", "none");
@@ -69,6 +87,7 @@ static void tst_res_read_file(void)
 int main (int argc, char **argv)
 {
     YAZ_CHECK_INIT(argc, argv);
+    YAZ_CHECK_LOG();
     tst_res_open();
     tst_res_read_file();
     YAZ_CHECK_TERM;
@@ -76,6 +95,7 @@ int main (int argc, char **argv)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab