Prepare for srcdir != dstdir in tests.

[idzebra-moved-to-github.git] / test / api / t2.c

diff --git a/test/api/t2.c b/test/api/t2.c
index d61ab16..beb66d6 100644 (file)
--- a/test/api/t2.c
+++ b/test/api/t2.c
@@ -1,5 +1,5 @@
-/* $Id: t2.c,v 1.7 2003-06-20 14:21:24 heikki Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+/* $Id: t2.c,v 1.10 2004-06-14 23:43:32 adam Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
 This file is part of the Zebra server.
@@ -20,9 +20,19 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.
 */
 
+#include <stdlib.h>
 #include <yaz/log.h>
 #include <zebraapi.h>
 
+/* read zebra.cfg from env var srcdir if it exists; otherwise current dir */
+static ZebraService start_service()
+{
+    char cfg[256];
+    char *srcdir = getenv("srcdir");
+    sprintf(cfg, "%.200s%szebra.cfg", srcdir ? srcdir : "", srcdir ? "/" : "");
+    return zebra_start(cfg, 0, 0);
+}
+
 int main(int argc, char **argv)
 {
     int exit_code = 0;
@@ -38,16 +48,18 @@ int main(int argc, char **argv)
 
     nmem_init ();
 
-    zs = zebra_start("t2.cfg");
+    zs = start_service();
     zh = zebra_open (zs);
     zebra_select_database(zh, "Default");
+    zebra_init(zh);
     zebra_begin_trans (zh, 1);
-    zebra_record_insert (zh, myrec, strlen(myrec),0);
+
+    zebra_add_record (zh, myrec, strlen(myrec));
 
     zebra_search_PQF (zh, "@attr 1=4 my", "set1", &hits);
-    if (hits < 1)
+    if (hits != 1)
     {
-        yaz_log(LOG_FATAL, "At least one hit expected");
+        yaz_log(LOG_FATAL, "Expected 1 hit. Got %d", hits);
         exit_code = 1;
     }