X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=test%2FMakefile.am;h=905526d2cb39a44fa50ddcb81a7bb92fe7d026f9;hp=5e92f722b2e031e98ad084479f3046a68139b1ca;hb=bfcb19b17256263c4fca826add7724ad7c847943;hpb=33054ee1b9de573a3de49e09267b1bfb912c5a0c

diff --git a/test/Makefile.am b/test/Makefile.am
index 5e92f72..905526d 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,15 +1,20 @@
 ## This file is part of the YAZ toolkit.
-## Copyright (C) 1995-2011 Index Data
+## Copyright (C) Index Data
 
-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_rpn2solr test_json test_xml_include test_file_glob \
- test_shared_ptr test_libstemmer
+check_PROGRAMS = test_ccl test_comstack test_cql2ccl \
+ test_embed_record test_filepath test_file_glob \
+ test_iconv test_icu test_json \
+ test_libstemmer test_log test_log_thread \
+ test_match_glob test_matchstr test_mutex \
+ test_nmem test_odr test_odrstack test_oid test_options \
+ test_pquery test_query_charset \
+ test_record_conv test_rpn2cql test_rpn2solr test_retrieval \
+ test_shared_ptr test_soap1 test_soap2 test_solr test_sortspec \
+ test_timing test_tpath test_wrbuf \
+ test_xmalloc test_xml_include test_xmlquery test_zgdu
 
-check_SCRIPTS = tstmarc.sh tstmarccol.sh tstcql2xcql.sh tstcql2pqf.sh tsticu.sh
+check_SCRIPTS = test_marc.sh test_marccol.sh test_cql2xcql.sh \
+	test_cql2pqf.sh test_icu.sh
 
 TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
 
@@ -21,9 +26,11 @@ EXTRA_DIST = tstodr.asn test_odrcodec.c test_odrcodec.h cql2xcqlsample \
  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 \
- tsticu-2.xml tsticu-2.input tsticu-2.output \
+ test_icu.0.xml test_icu.0.input test_icu.0.output \
+ test_icu.1.xml test_icu.1.input test_icu.1.output \
+ test_icu.2.xml test_icu.2.input test_icu.2.output \
+ test_icu.3.xml test_icu.3.input test_icu.3.output \
+ test_icu.4.xml test_icu.4.input test_icu.4.output \
  test_record_conv.xsl test_xml_include.xml
 
 YAZCOMP = ../util/yaz-asncomp
@@ -39,6 +46,8 @@ dist-hook:
 	cp $(srcdir)/marc?.chr $(distdir)
 	cp $(srcdir)/marc?.marc $(distdir)
 	cp $(srcdir)/marc?.xml $(distdir)
+	cp $(srcdir)/marc?.json $(distdir)
+	cp $(srcdir)/marc?.json.marc $(distdir)
 	cp $(srcdir)/*.xml.marc $(distdir)
 	cp $(srcdir)/xml2marc?.xml $(distdir)
 	cp $(srcdir)/tmarc?.xml $(distdir)
@@ -54,6 +63,7 @@ test_libstemmer_LDADD = ../src/libyaz_icu.la ../src/libyaz.la $(ICU_LIBS)
 
 CONFIG_CLEAN_FILES=*.log
 
+test_cql2ccl_SOURCES = test_cql2ccl.c
 test_xmalloc_SOURCES = test_xmalloc.c
 test_iconv_SOURCES = test_iconv.c
 test_nmem_SOURCES = test_nmem.c
@@ -66,8 +76,11 @@ 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_solr_SOURCES = test_solr.c
+test_sortspec_SOURCES = test_sortspec.c
 test_log_thread_SOURCES = test_log_thread.c
 test_xmlquery_SOURCES = test_xmlquery.c
+test_options_SOURCES = test_options.c
 test_pquery_SOURCES = test_pquery.c
 test_comstack_SOURCES = test_comstack.c
 test_filepath_SOURCES = test_filepath.c
@@ -86,3 +99,5 @@ test_xml_include_SOURCES = test_xml_include.c
 test_file_glob_SOURCES = test_file_glob.c
 test_shared_ptr_SOURCES = test_shared_ptr.c
 test_libstemmer_SOURCES = test_libstemmer.c
+test_embed_record_SOURCES = test_embed_record.c
+test_zgdu_SOURCES = test_zgdu.c