From: Dennis Schafroth <dennis@indexdata.com>
Date: Wed, 25 Apr 2012 10:40:03 +0000 (+0200)
Subject: Merge branch 'master' into protocol-version2
X-Git-Tag: v1.6.13~16^2~14
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=02285d44c6c35b401313d6c148db918b3edaaebf;p=pazpar2-moved-to-github.git

Merge branch 'master' into protocol-version2

Test re-write in master

Conflicts:
	test/Makefile.am
	test/test_solr_4.res
	test/test_solr_5.res
---

02285d44c6c35b401313d6c148db918b3edaaebf
diff --cc .cproject
index 6fed192,6fed192..167119a
--- a/.cproject
+++ b/.cproject
@@@ -24,6 -24,6 +24,9 @@@
  							<targetPlatform id="cdt.managedbuild.target.gnu.platform.macosx.exe.debug.206052691" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.macosx.exe.debug"/>
  							<builder arguments="-k" buildPath="${workspace_loc:/pazpar2.master/Debug}" command="make" id="cdt.managedbuild.target.gnu.builder.macosx.exe.debug.2009339594" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.macosx.exe.debug"/>
  							<tool id="cdt.managedbuild.tool.macosx.c.linker.macosx.exe.debug.937721886" name="MacOS X C Linker" superClass="cdt.managedbuild.tool.macosx.c.linker.macosx.exe.debug">
++								<option id="macosx.c.link.option.paths.1800125633" superClass="macosx.c.link.option.paths" valueType="libPaths">
++									<listOptionValue builtIn="false" value="/opt/local/lib/"/>
++								</option>
  								<inputType id="cdt.managedbuild.tool.macosx.c.linker.input.377427532" superClass="cdt.managedbuild.tool.macosx.c.linker.input">
  									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
  									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
@@@ -75,6 -75,6 +78,9 @@@
  							<targetPlatform id="cdt.managedbuild.target.gnu.platform.macosx.exe.release.2059998902" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.macosx.exe.release"/>
  							<builder buildPath="${workspace_loc:/pazpar2.master/Release}" id="cdt.managedbuild.target.gnu.builder.macosx.exe.release.893517025" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.macosx.exe.release"/>
  							<tool id="cdt.managedbuild.tool.macosx.c.linker.macosx.exe.release.217097143" name="MacOS X C Linker" superClass="cdt.managedbuild.tool.macosx.c.linker.macosx.exe.release">
++								<option id="macosx.c.link.option.paths.2084961" superClass="macosx.c.link.option.paths" valueType="libPaths">
++									<listOptionValue builtIn="false" value="/opt/local/lib/"/>
++								</option>
  								<inputType id="cdt.managedbuild.tool.macosx.c.linker.input.1144641815" superClass="cdt.managedbuild.tool.macosx.c.linker.input">
  									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
  									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
diff --cc test/Makefile.am
index 1c7061b,4a76ba8..103c239
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@@ -17,11 -16,7 +17,12 @@@ EXTRA_DIST = run_pazpar2.sh marc21_test
  	test_url.cfg test_url.urls \
  	test_filter.cfg test_filter.urls \
  	test_termlist_block.cfg test_termlist_block.urls \
 +	test_limit_limitmap.cfg test_limit_limitmap.urls \
 +	test_limit_limitmap_service_1.xml test_limit_limitmap_service_2.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 \
+ 	ztest_localhost_settings.xml test_termlist_block_settings_2.xml \
  	$(check_SCRIPTS)
  
  TESTS = $(check_SCRIPTS)