-/* $Id: testlib.c,v 1.16 2005-05-02 09:05:22 adam Exp $
+/* $Id: testlib.c,v 1.22 2005-06-14 20:02:30 adam Exp $
Copyright (C) 1995-2005
Index Data ApS
/** testlib - utilities for the api tests */
+#include <sys/time.h>
+#include <sys/resource.h>
+#if HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
#include <assert.h>
#include <yaz/log.h>
#include <yaz/pquery.h>
void start_log(int argc, char **argv)
{
+ int cmd_level = 0;
char logname[2048];
if (!argv)
return;
return;
sprintf(logname, "%s.log", argv[0]);
yaz_log_init_file(logname);
- log_level = yaz_log_mask_str_x(argv[0],0);
- yaz_log_init_level(YLOG_DEFAULT_LEVEL | log_level);
- yaz_log(log_level,"starting %s",argv[0]);
+ log_level = yaz_log_mask_str_x(argv[0], 0);
+ if (argc >= 2)
+ cmd_level |= yaz_log_mask_str_x(argv[1], 0);
+ yaz_log_init_level(YLOG_DEFAULT_LEVEL | log_level | cmd_level);
+ yaz_log(log_level, "starting %s", argv[0]);
}
/**
*/
ZebraService start_up(char *cfgname, int argc, char **argv)
{
+ struct rlimit rlim;
+ rlim.rlim_cur = 20;
+ rlim.rlim_max = 20;
+ setrlimit(RLIMIT_CPU, &rlim);
nmem_init();
start_log(argc, argv);
return start_service(cfgname);
}
-int do_query_x(int lineno, ZebraHandle zh, char *query, int exphits,
- int experror)
+int do_query_x(int lineno, ZebraHandle zh, const char *query, zint exphits,
+ int experror)
{
ODR odr;
YAZ_PQF_Parser parser;
rc = zebra_search_RPN(zh, odr, rpn, setname, &hits);
if (experror)
{
+ int code;
if (rc != ZEBRA_FAIL)
{
printf("Error: search returned %d (OK), but error was expected\n"
"%s\n", rc, query);
exit(1);
}
- int code = zebra_errCode(zh);
+ code = zebra_errCode(zh);
if (code != experror)
{
printf("Error: search returned error code %d, but error %d was "
}
if (exphits != -1 && hits != exphits) {
printf("Error: search returned " ZINT_FORMAT
- " hits instead of %d\n%s\n",
+ " hits instead of " ZINT_FORMAT "\n%s\n",
hits, exphits, query);
exit (1);
}
}
-int do_query(int lineno, ZebraHandle zh, char *query, int exphits)
+int do_query(int lineno, ZebraHandle zh, const char *query, zint exphits)
{
return do_query_x(lineno, zh, query, exphits, 0);
}
if (!strstr(retrievalRecord[0].buf, firstrec))
{
printf("Error: Got the wrong record first\n");
- printf("Expected '%s' but got \n", firstrec);
+ printf("Expected '%s' but got\n", firstrec);
printf("%.*s\n", retrievalRecord[0].len, retrievalRecord[0].buf);
exit(1);
}
{
if (meta[i].sysno != ids[i])
{
- printf("Expected id=" ZINT_FORMAT " but got id=" ZINT_FORMAT,
+ printf("Expected id=" ZINT_FORMAT " but got id=" ZINT_FORMAT "\n",
ids[i], meta[i].sysno);
exit(1);
}