X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Ftstcharmap.c;h=34929d5fba2177e12be0ef1eec3b7f322389646d;hb=11edef8271df7f3598f94373720aea3a5b6b3ad5;hp=edff882d0a2b9511b7ed18c2cc0e5eab03d96147;hpb=be32b4e5c154545c2b91b76144d6cbf1238f969a;p=idzebra-moved-to-github.git

diff --git a/util/tstcharmap.c b/util/tstcharmap.c
index edff882..34929d5 100644
--- a/util/tstcharmap.c
+++ b/util/tstcharmap.c
@@ -1,4 +1,4 @@
-/* $Id: tstcharmap.c,v 1.1 2005-06-15 21:31:45 adam Exp $
+/* $Id: tstcharmap.c,v 1.4 2006-05-10 08:13:46 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -24,14 +24,26 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <stdio.h>
 #include <assert.h>
 #include <charmap.h>
+#include <yaz/log.h>
+
+/* use env srcdir as base directory - or current directory if unset */
+const char *get_srcdir()
+{
+    const char *srcdir = getenv("srcdir");
+    if (!srcdir || ! *srcdir)
+        srcdir=".";
+    return srcdir;
+
+}
 
 void tst1()
 {
     /* open existing map chrmaptab.chr */
-    chrmaptab tab = chrmaptab_create(0 /* tabpath */,
+    chrmaptab tab = chrmaptab_create(get_srcdir() /* tabpath */,
 				     "tstcharmap.chr" /* file */,
 				     0 /* tabroot */ );
-    assert(tab);
+    if (!tab)
+	exit(1);
     
     chrmaptab_destroy(tab);
 }
@@ -39,10 +51,12 @@ void tst1()
 void tst2()
 {
     /* open non-existing nonexist.chr */
-    chrmaptab tab = chrmaptab_create(0 /* tabpath */,
+    chrmaptab tab = chrmaptab_create(get_srcdir() /* tabpath */,
 				     "nonexist.chr" /* file */,
 				     0 /* tabroot */ );
-    assert(!tab);
+    
+    if (tab)
+	exit(0);
 }
 
 int main(int argc, char **argv)
@@ -57,3 +71,11 @@ int main(int argc, char **argv)
     exit(0);
 }
 
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+