-/* $Id: tstcharmap.c,v 1.7 2007-01-15 15:10:26 adam Exp $
+/* $Id: tstcharmap.c,v 1.8 2007-05-16 12:31:17 adam Exp $
Copyright (C) 1995-2007
Index Data ApS
*/
-#include <stdlib.h>
-#include <stdio.h>
-#include <assert.h>
#include <charmap.h>
-#include <yaz/log.h>
+#include <yaz/test.h>
/* use env srcdir as base directory - or current directory if unset */
const char *get_srcdir(void)
chrmaptab tab = chrmaptab_create(get_srcdir() /* tabpath */,
"tstcharmap.chr" /* file */,
0 /* tabroot */ );
- if (!tab)
- exit(1);
-
+ YAZ_CHECK(tab);
chrmaptab_destroy(tab);
}
chrmaptab tab = chrmaptab_create(get_srcdir() /* tabpath */,
"nonexist.chr" /* file */,
0 /* tabroot */ );
-
- if (tab)
- exit(0);
+ YAZ_CHECK(!tab);
+ chrmaptab_destroy(tab);
}
int main(int argc, char **argv)
{
- char logname[2048];
- sprintf(logname, "%s.log", argv[0]);
- yaz_log_init_file(logname);
+ YAZ_CHECK_INIT(argc, argv);
+ YAZ_CHECK_LOG();
tst1();
tst2();
- exit(0);
+ YAZ_CHECK_TERM;
}
/*
-/* $Id: tstflock.c,v 1.18 2007-01-15 15:10:26 adam Exp $
+/* $Id: tstflock.c,v 1.19 2007-05-16 12:31:17 adam Exp $
Copyright (C) 1995-2007
Index Data ApS
int main(int argc, char **argv)
{
- char logname[220];
YAZ_CHECK_INIT(argc, argv);
-
- sprintf(logname, "%.200s.log", argv[0]);
- yaz_log_init_file(logname);
-
- /* log time + thread id (%!) */
- yaz_log_time_format("%c:%!");
+ YAZ_CHECK_LOG();
/* ensure the flock system logs in our test */
yaz_log_init_level(yaz_log_mask_str("flock"));
-/* $Id: tstlockscope.c,v 1.1 2006-07-02 21:22:17 adam Exp $
- Copyright (C) 2006
+/* $Id: tstlockscope.c,v 1.2 2007-05-16 12:31:17 adam Exp $
+ Copyright (C) 1995-2007
Index Data ApS
+
+This file is part of the Zebra server.
+
+Zebra is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+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 this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
/** \file tstlockscope.c
\brief tests scope of fcntl locks.. Either "process" or "thread"
*/
-#include <errno.h>
#include <assert.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <pthread.h>
+#include <yaz/log.h>
+#include <yaz/test.h>
#if YAZ_POSIX_THREADS
#include <fcntl.h>
#endif
return 0;
}
-int main(int argc, char **argv)
+void tst(void)
{
pthread_t child_thread;
+ int r;
fd = open("my.LCK", (O_CREAT|O_RDWR), 0666);
+
+ YAZ_CHECK(fd != -1);
if (fd == -1)
{
- fprintf(stderr, "open: %s\n", strerror(errno));
- exit(1);
+ yaz_log(YLOG_FATAL|YLOG_ERRNO, "open");
+ return;
}
- if (file_lock(fd, F_WRLCK, F_SETLKW) == -1)
+ r = file_lock(fd, F_WRLCK, F_SETLKW);
+ YAZ_CHECK(r != -1);
+ if (r == -1)
{
- fprintf(stderr, "fcntl: %s\n", strerror(errno));
- exit(1);
+ yaz_log(YLOG_FATAL|YLOG_ERRNO, "fcnt");
+ return;
}
#if YAZ_POSIX_THREADS
pthread_create(&child_thread, 0 /* attr */, run_func, 0);
pthread_join(child_thread, 0);
#endif
- printf("fcntl lock scope: %s\n", scope);
+ yaz_log(YLOG_LOG, "fcntl lock scope: %s", scope);
+}
+
+int main(int argc, char **argv)
+{
+ YAZ_CHECK_INIT(argc, argv);
+ YAZ_CHECK_LOG();
+ tst();
+ YAZ_CHECK_TERM;
return 0;
}