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

diff --git a/util/tstcharmap.c b/util/tstcharmap.c
index edff882..da7151a 100644
--- a/util/tstcharmap.c
+++ b/util/tstcharmap.c
@@ -1,5 +1,5 @@
-/* $Id: tstcharmap.c,v 1.1 2005-06-15 21:31:45 adam Exp $
-   Copyright (C) 1995-2005
+/* $Id: tstcharmap.c,v 1.5 2006-08-14 10:40:34 adam Exp $
+   Copyright (C) 1995-2006
    Index Data ApS
 
 This file is part of the Zebra server.
@@ -15,23 +15,35 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
 #include <stdlib.h>
 #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
+ */
+