From: Adam Dickmeiss <adam@indexdata.dk>
Date: Sun, 8 Sep 2013 06:49:39 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
X-Git-Tag: v1.6.35~4
X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=0f3411adfbf51c580c0c194e7da90734ebe1282c;hp=c0d763b3d02dcf269a4e45477668ac6bf901a204;p=pazpar2-moved-to-github.git

Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
---

diff --git a/test/Makefile.am b/test/Makefile.am
index 3029310..4bf29e0 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -4,8 +4,7 @@
 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_url.sh test_filter.sh test_tmarc.sh \
- $(solr_tests) 
+ test_url.sh test_filter.sh test_tmarc.sh 
 
 EXTRA_DIST = run_pazpar2.sh marc21_test.xsl tmarc.xsl solr-pz2.xsl \
 	z3950_indexdata_com_marc.xml \