X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=test%2FMakefile.am;h=2723753fb7f0f53956263e83d7110e440c862e75;hp=102f4e9b30db4885ebc112fbc3e20b7048bfe9e3;hb=6bc9db9f9f6944f86f1337a9a4f1e232678afc7b;hpb=455798a3154b5c08c872ca0fb90607ddea575038

diff --git a/test/Makefile.am b/test/Makefile.am
index 102f4e9..2723753 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,54 +1,85 @@
-## Copyright (C) 1994-2004, Index Data
-## All rights reserved.
-## $Id: Makefile.am,v 1.9 2005-09-09 10:34:09 adam Exp $
+## This file is part of the YAZ toolkit.
+## Copyright (C) 1995-2010 Index Data
 
-check_PROGRAMS = tsticonv tstnmem tstmatchstr tstwrbuf tstodr tstccl tstlog \
- tstsoap1 tstsoap2 tstodrstack tstlogthread
-check_SCRIPTS = tstcql.sh tstmarc.sh
+check_PROGRAMS = test_xmalloc test_iconv test_nmem test_matchstr test_wrbuf \
+ test_odr test_ccl test_log test_mutex \
+ test_soap1 test_soap2 test_odrstack test_log_thread test_xmlquery test_pquery \
+ test_comstack test_filepath test_record_conv test_retrieval test_tpath \
+ test_timing test_query_charset test_oid test_icu test_match_glob \
+ test_rpn2cql test_json test_xml_include test_file_glob
+
+check_SCRIPTS = tstmarc.sh tstmarccol.sh tstcql2xcql.sh tstcql2pqf.sh tsticu.sh
 
 TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
 
-EXTRA_DIST = tstodr.asn tstodrcodec.c tstodrcodec.h cqlsample \
+EXTRA_DIST = tstodr.asn test_odrcodec.c test_odrcodec.h cql2xcqlsample \
+ cql2pqf-order.txt cql2pqfsample \
  $(check_SCRIPTS) \
- marc1 marc1.xml marc2 marc2.xml marc3 marc3.xml marc4 marc4.xml
-
-YAZCOMP = $(top_srcdir)/util/yaz-asncomp
+ marccol1.u8.marc marccol1.u8.1.lst marccol1.u8.2.lst \
+ marccol2.u8.marc marccol2.u8.1.lst marccol2.u8.2.lst \
+ marccol3.u8.marc marccol3.u8.1.lst marccol3.u8.2.lst \
+ marccol4.u8.marc marccol4.u8.1.lst marccol4.u8.2.lst \
+ marccol5.u8.marc marccol5.u8.1.lst marccol5.u8.2.lst \
+ tsticu-0.xml tsticu-0.input tsticu-0.output \
+ tsticu-1.xml tsticu-1.input tsticu-1.output \
+ test_record_conv.xsl test_xml_include.xml
+
+YAZCOMP = ../util/yaz-asncomp
 YAZCOMPLINE = $(YAZCOMP) -d z.tcl -i yaz -I../include $(YCFLAGS)
 
-AM_CFLAGS=$(THREAD_CFLAGS)
-
-AM_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS)
+AM_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS) $(ICU_CPPFLAGS)
 
 dist-hook:
 	mkdir -p $(distdir)/cql
-	cp $(srcdir)/cql/*.err $(distdir)/cql
-	cp $(srcdir)/cql/*.out $(distdir)/cql
+	cp $(srcdir)/cql/*.err $(srcdir)/cql/*.out $(distdir)/cql
+	mkdir -p $(distdir)/cql2pqf
+	cp $(srcdir)/cql2pqf/*.err $(srcdir)/cql2pqf/*.out $(distdir)/cql2pqf
+	cp $(srcdir)/marc?.chr $(distdir)
+	cp $(srcdir)/marc?.marc $(distdir)
+	cp $(srcdir)/marc?.xml $(distdir)
+	cp $(srcdir)/*.xml.marc $(distdir)
+	cp $(srcdir)/xml2marc?.xml $(distdir)
+	cp $(srcdir)/tmarc?.xml $(distdir)
+	cp $(srcdir)/xml2tmarc?.xml $(distdir)
 
 # Rule for generating codecs for our small ASN.1 spec
-tstodrcodec.c tstodrcodec.h: tstodr.asn $(YAZCOMP)
+test_odrcodec.c test_odrcodec.h: tstodr.asn $(YAZCOMP)
 	cd $(srcdir); $(YAZCOMP) tstodr.asn
 
 LDADD = ../src/libyaz.la
-
-tsticonv_SOURCES = tsticonv.c
-
-tstnmem_SOURCES = tstnmem.c
-
-tstmatchstr_SOURCES = tstmatchstr.c
-
-tstwrbuf_SOURCES = tstwrbuf.c
-
-tstodr_SOURCES = tstodrcodec.c tstodrcodec.h tstodr.c
-
-tstodrstack_SOURCES = tstodrstack.c
-
-tstccl_SOURCES = tstccl.c
-
-tstlog_SOURCES = tstlog.c
-
-tstsoap1_SOURCES = tstsoap1.c
-
-tstsoap2_SOURCES = tstsoap2.c
-
-tstlogthread_SOURCES = tstlogthread.c
-
+test_icu_LDADD = ../src/libyaz_icu.la ../src/libyaz.la $(ICU_LIBS)
+test_mutex_LDADD = ../src/libyaz_server.la ../src/libyaz.la $(PTHREAD_LIBS)
+AM_CFLAGS = $(PTHREAD_CFLAGS)
+
+
+CONFIG_CLEAN_FILES=*.log
+
+test_xmalloc_SOURCES = test_xmalloc.c
+test_iconv_SOURCES = test_iconv.c
+test_nmem_SOURCES = test_nmem.c
+test_matchstr_SOURCES = test_matchstr.c
+test_wrbuf_SOURCES = test_wrbuf.c
+test_odr_SOURCES = test_odrcodec.c test_odrcodec.h test_odr.c
+test_odrstack_SOURCES = test_odrstack.c
+test_ccl_SOURCES = test_ccl.c
+test_log_SOURCES = test_log.c
+test_mutex_SOURCES = test_mutex.c
+test_soap1_SOURCES = test_soap1.c
+test_soap2_SOURCES = test_soap2.c
+test_log_thread_SOURCES = test_log_thread.c
+test_xmlquery_SOURCES = test_xmlquery.c
+test_pquery_SOURCES = test_pquery.c
+test_comstack_SOURCES = test_comstack.c
+test_filepath_SOURCES = test_filepath.c
+test_oid_SOURCES = test_oid.c
+test_record_conv_SOURCES = test_record_conv.c
+test_retrieval_SOURCES = test_retrieval.c
+test_tpath_SOURCES = test_tpath.c
+test_timing_SOURCES = test_timing.c
+test_query_charset_SOURCES = test_query_charset.c
+test_icu_SOURCES = test_icu.c
+test_match_glob_SOURCES = test_match_glob.c
+test_rpn2cql_SOURCES = test_rpn2cql.c
+test_json_SOURCES = test_json.c
+test_xml_include_SOURCES = test_xml_include.c
+test_file_glob_SOURCES = test_file_glob.c