X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fmbox%2Fmbox1.c;h=62b5ea1dc1153b8c1594f28be3dbbe8a1eca67d4;hb=b571d1a1012dfbe07e4a484ea5425c909bbf7120;hp=82c7ed8ac883b473703a7bc9f372fdd53bf4caa2;hpb=18f466a66abebb91634853a5eb2dc7cadc3c8ce2;p=idzebra-moved-to-github.git

diff --git a/test/mbox/mbox1.c b/test/mbox/mbox1.c
index 82c7ed8..62b5ea1 100644
--- a/test/mbox/mbox1.c
+++ b/test/mbox/mbox1.c
@@ -1,5 +1,5 @@
-/* $Id: mbox1.c,v 1.1 2005-04-28 09:18:20 adam Exp $
-   Copyright (C) 1995-2005
+/* $Id: mbox1.c,v 1.6 2006-10-30 14:05:31 adam Exp $
+   Copyright (C) 1995-2006
    Index Data ApS
 
 This file is part of the Zebra server.
@@ -15,40 +15,50 @@ 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 "testlib.h"
 	
-int main(int argc, char **argv)
+static void tst(int argc, char **argv)
 {
     char path[256];
 
-    ZebraService zs = start_up(0, argc, argv);
-    ZebraHandle  zh = zebra_open(zs);
+    ZebraService zs = tl_start_up(0, argc, argv);
+    ZebraHandle  zh = zebra_open(zs, 0);
 
-    check_filter(zs, "grs.regx");
-    zebra_select_database(zh, "Default");
+    tl_check_filter(zs, "grs.regx");
+    YAZ_CHECK(zebra_select_database(zh, "Default") == ZEBRA_OK);
 
     zebra_init(zh);
 
-    zebra_begin_trans(zh, 1);
-    sprintf(path, "%.200s/mail1.mbx", get_srcdir());
+    YAZ_CHECK(zebra_begin_trans(zh, 1) == ZEBRA_OK);
+    sprintf(path, "%.200s/mail1.mbx", tl_get_srcdir());
     zebra_repository_update(zh, path);
 
-    sprintf(path, "%.200s/mail3.mbx", get_srcdir());
+    sprintf(path, "%.200s/mail3.mbx", tl_get_srcdir());
     zebra_repository_update(zh, path);
 
-#if 0
+#if 1
     /* bug #234 */
-    sprintf(path, "%.200s/invalid.mbx", get_srcdir());
+    sprintf(path, "%.200s/invalid.mbx", tl_get_srcdir());
     zebra_repository_update(zh, path);
 #endif
 
-    zebra_end_trans(zh);
+    YAZ_CHECK(zebra_end_trans(zh) == ZEBRA_OK);
     zebra_commit(zh);
-
-    return close_down(zh, zs, 0);
+    
+    YAZ_CHECK(tl_close_down(zh, zs));
 }
+
+TL_MAIN
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+