X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2FMakefile.am;h=24b417f5c96ab7ee10157d3b2388289c0b245473;hb=bf28b66495c1078c0f0f55d15618d4e3437ebfae;hp=94bf11c1df201ccdda4d8b0fd943d1026ef9de86;hpb=ffd54fb0903fe74bc03446cdb6cf63da4af4e115;p=pazpar2-moved-to-github.git

diff --git a/test/Makefile.am b/test/Makefile.am
index 94bf11c..24b417f 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,10 +1,36 @@
 # This file is part of Pazpar2.
-check_SCRIPTS = test_http.sh test_icu.sh test_post.sh
 
-EXTRA_DIST = run_pazpar2.sh marc21.xsl z3950_indexdata_com_marc.xml \
+# These tests require a Solr target
+solr_tests = test_solr.sh test_termlist_block.sh test_limit_limitmap.sh
+check_SCRIPTS = test_http.sh test_icu.sh test_post.sh \
+ test_settings.sh test_turbomarcxml.sh test_facets.sh \
+ test_url.sh test_filter.sh \
+ $(solr_tests)
+
+EXTRA_DIST = run_pazpar2.sh marc21_test.xsl tmarc.xsl solr-pz2.xsl \
+	z3950_indexdata_com_marc.xml \
 	gils_service.xml marc_service.xml marc21.mmap \
-	test_http.cfg test_http_urls test_icu.cfg test_icu_urls \
-	test_post.cfg test_post_urls $(check_SCRIPTS)
+	test_facets.cfg test_facets.urls \
+	test_icu.cfg test_icu.urls \
+	test_http.cfg test_http.urls \
+	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_5.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_limit_limitmap.cfg test_limit_limitmap.urls \
+	test_limit_limitmap_service.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 \
+	$(check_SCRIPTS)
 
 TESTS = $(check_SCRIPTS)
 
@@ -12,8 +38,10 @@ MAINTAINERCLEANFILES = Makefile.in
 
 CONFIG_CLEAN_FILES=*.log *.dif
 
-dist-hook:
-	cp ${srcdir}/test_http_*.res $(distdir)
-	cp ${srcdir}/test_icu_*.res $(distdir)
-	cp ${srcdir}/test_post_*.res $(distdir)
+clean-local:
+	rm -f *.log *.dif
 
+dist-hook:
+	cp ${srcdir}/test_*.res $(distdir)
+	mkdir $(distdir)/set2
+	cp ${srcdir}/set2/*.xml $(distdir)/set2