X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2FMakefile.am;h=607b06d59da80aa17647f0e4b9e9a47981247673;hb=f451628ce616009071ab80cbe201cc7a3f60702d;hp=aaa63bd315f169cb1f0163e3ace3562f0cbaa748;hpb=982286f9b491f42d4f5c1cae5198e8b844833e4f;p=pazpar2-moved-to-github.git

diff --git a/test/Makefile.am b/test/Makefile.am
index aaa63bd..607b06d 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,8 +1,11 @@
 # This file is part of Pazpar2.
+
+# These tests require a Solr target
+solr_tests = test_solr.sh test_termlist_block.sh test_limit_limitmap.sh test_sort.sh
 check_SCRIPTS = test_http.sh test_icu.sh test_post.sh \
  test_settings.sh test_turbomarcxml.sh test_facets.sh \
- test_solr.sh test_url.sh test_filter.sh \
- test_termlist_block.sh test_limit_limitmap.sh
+ test_url.sh test_filter.sh test_tmarc.sh test_sru.sh \
+ $(solr_tests)
 
 EXTRA_DIST = run_pazpar2.sh marc21_test.xsl tmarc.xsl solr-pz2.xsl \
 	z3950_indexdata_com_marc.xml \
@@ -13,19 +16,24 @@ EXTRA_DIST = run_pazpar2.sh marc21_test.xsl tmarc.xsl solr-pz2.xsl \
 	test_post.cfg test_post.urls \
 	test_settings.cfg test_settings.urls \
 	test_solr.cfg test_solr.urls \
-	test_solr_settings_1.xml  test_solr_settings_2.xml  test_solr_settings_3.xml  test_solr_settings_4.xml \
+	test_solr_settings_1.xml test_solr_settings_2.xml  test_solr_settings_3.xml \
+	test_solr_settings_4.xml test_solr_settings_5.xml  test_solr_settings_6.xml \
+	test_sort.cfg test_sort.urls \
+	test_sort_settings.xml  \
 	test_turbomarcxml.cfg test_turbomarcxml.urls \
 	test_url.cfg test_url.urls \
 	test_filter.cfg test_filter.urls \
 	test_termlist_block.cfg test_termlist_block.urls \
 	test_facets_settings_1.xml  test_facets_settings_2.xml \
-	test_url_service.xml  test_url_settings_1.xml  test_url_settings_2.xml  test_url_settings_3.xml  test_url_settings_4.xml \
+	test_url_service.xml test_url_settings.xml \
 	test_limit_limitmap.cfg test_limit_limitmap.urls \
 	test_limit_limitmap_service.xml \
-	test_limit_limitmap_setting_1.xml test_limit_limitmap_setting_2.xml \
-	test_limit_limitmap_setting_3.xml test_limit_limitmap_setting_4.xml \
-	test_limit_limitmap_setting_5.xml \
+	test_limit_limitmap_settings_1.xml test_limit_limitmap_settings_2.xml \
+	test_limit_limitmap_settings_3.xml test_limit_limitmap_settings_4.xml \
+	test_limit_limitmap_settings_5.xml \
 	ztest_localhost_settings.xml test_termlist_block_settings_2.xml \
+	test_facets_settings_1.xml test_facets_settings_2.xml \
+	test_sru.cfg sru_service.xml \
 	$(check_SCRIPTS)
 
 TESTS = $(check_SCRIPTS)
@@ -41,3 +49,5 @@ dist-hook:
 	cp ${srcdir}/test_*.res $(distdir)
 	mkdir $(distdir)/set2
 	cp ${srcdir}/set2/*.xml $(distdir)/set2
+	cp ${srcdir}/tmarc?.xml $(distdir)
+	cp ${srcdir}/tmarc?.res.xml $(distdir)