Update for YAZ 3s new OID system

[idzebra-moved-to-github.git] / test / api / testlib.h

diff --git a/test/api/testlib.h b/test/api/testlib.h
index 96f31b1..1d3fcba 100644 (file)
--- a/test/api/testlib.h
+++ b/test/api/testlib.h
@@ -1,5 +1,5 @@
-/* $Id: testlib.h,v 1.20 2006-08-14 10:40:22 adam Exp $
-   Copyright (C) 1995-2006
+/* $Id: testlib.h,v 1.25 2007-04-16 08:44:32 adam Exp $
+   Copyright (C) 1995-2007
    Index Data ApS
 
 This file is part of the Zebra server.
@@ -28,6 +28,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <yaz/log.h>
 #include <idzebra/api.h>
 #include <yaz/test.h>
+#include <yaz/oid_db.h>
 
 /** 
  * tl_start_up : Does all the usual start functions
@@ -43,7 +44,7 @@ ZebraService tl_start_up(char *cfgname, int argc, char **argv);
  * get_srcdir : returns the source dir. Most often ".", but when
  * making distcheck, some other dir 
  */
-const char *tl_get_srcdir();
+const char *tl_get_srcdir(void);
 
 /** 
  * start_log: open a log file 
@@ -68,17 +69,17 @@ ZebraService tl_zebra_start(const char *cfgname);
  * returns the retcode, for use in return or exit in main()
  */
 int tl_close_down(ZebraHandle zh, ZebraService zs
-    ) GCC_ATTRIBUTE((warn_unused_result));    
+    ) ZEBRA_GCC_ATTR((warn_unused_result));    
 
 /** inits the database and inserts test data */
 int tl_init_data(ZebraHandle zh, const char **recs
-    ) GCC_ATTRIBUTE((warn_unused_result));    
+    ) ZEBRA_GCC_ATTR((warn_unused_result));    
 
 /**
  * tl_query does a simple query, and checks that the number of hits matches
  */
 int tl_query(ZebraHandle zh, const char *query, zint exphits
-    ) GCC_ATTRIBUTE((warn_unused_result));
+    ) ZEBRA_GCC_ATTR((warn_unused_result));
 
 
 /**
@@ -86,7 +87,7 @@ int tl_query(ZebraHandle zh, const char *query, zint exphits
  */
 int tl_query_x(ZebraHandle zh, const char *query, zint exphits,
               int experror
-    ) GCC_ATTRIBUTE((warn_unused_result));
+    ) ZEBRA_GCC_ATTR((warn_unused_result));
     
 /**
  * tl_scan is a utility for scan testing 
@@ -95,10 +96,10 @@ int tl_scan(ZebraHandle zh, const char *query,
            int pos, int num,  /* input params */
            int exp_pos, int exp_num,  int exp_partial, /* expected result */
            const char **exp_entries  /* expected entries (or NULL) */
-    ) GCC_ATTRIBUTE((warn_unused_result));
+    ) ZEBRA_GCC_ATTR((warn_unused_result));
 
 int tl_sort(ZebraHandle zh, const char *query, zint hits, zint *exp
-    ) GCC_ATTRIBUTE((warn_unused_result));
+    ) ZEBRA_GCC_ATTR((warn_unused_result));
 
 /** 
  * ranking_query makes a query, checks number of hits, and for 
@@ -107,7 +108,7 @@ int tl_sort(ZebraHandle zh, const char *query, zint hits, zint *exp
  */
 int tl_ranking_query(ZebraHandle zh, char *query, 
                     int exphits, char *firstrec, int firstscore
-    ) GCC_ATTRIBUTE((warn_unused_result));
+    ) ZEBRA_GCC_ATTR((warn_unused_result));
 
 /** 
  * meta_query makes a query, checks number of hits, and for 
@@ -115,7 +116,7 @@ int tl_ranking_query(ZebraHandle zh, char *query,
  */
 int tl_meta_query(ZebraHandle zh, char *query, int exphits,
                  zint *ids
-    ) GCC_ATTRIBUTE((warn_unused_result));
+    ) ZEBRA_GCC_ATTR((warn_unused_result));
 
 /**
  * if filter given by name does not exist, exit nicely but warn in log 
@@ -123,7 +124,7 @@ int tl_meta_query(ZebraHandle zh, char *query, int exphits,
 void tl_check_filter(ZebraService zs, const char *name);
 
 #define TL_MAIN int main(int argc, char **argv) { \
- YAZ_CHECK_INIT(argc, argv); tst(argc, argv); YAZ_CHECK_TERM; }
+ YAZ_CHECK_INIT(argc, argv); YAZ_CHECK_LOG(); tst(argc, argv); YAZ_CHECK_TERM; }
 /*
  * Local variables:
  * c-basic-offset: 4