From d7d66d537cd144f556fb8316ef6fd483b142e1f6 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Wed, 15 Oct 2014 11:43:33 +0200 Subject: [PATCH] Fix missing .url files PAZ-977 Add missing .url+.cfg and add proper check for it. --- test/Makefile.am | 2 ++ test/run_pazpar2.sh | 13 +++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/test/Makefile.am b/test/Makefile.am index 8976541..27583bd 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -12,6 +12,8 @@ EXTRA_DIST = run_pazpar2.sh marc21_test.xsl tmarc.xsl solr-pz2.xsl \ gils_service.xml marc_service.xml marc21.mmap \ test_facets.cfg test_facets.urls \ test_icu.cfg test_icu.urls \ + test_sru.cfg test_sru.urls \ + test_perf.cfg test_perf.urls \ test_http.cfg test_http.urls \ test_post.cfg test_post.urls \ test_settings.cfg test_settings.urls \ diff --git a/test/run_pazpar2.sh b/test/run_pazpar2.sh index 1f4a94d..c0b8f85 100755 --- a/test/run_pazpar2.sh +++ b/test/run_pazpar2.sh @@ -59,6 +59,17 @@ if test "x${PREFIX}" = "x"; then exit 1 fi +URLS=${PREFIX}.urls +if test ! -f ${srcdir}/${URLS}; then + echo "${srcdir}/${URLS} missing" + exit 1 +fi +CFG=${PREFIX}.cfg +if test ! -f ${srcdir}/${CFG}; then + echo "${srcdir}/${CFG} missing" + exit 1 +fi + # look for curl in PATH oIFS=$IFS IFS=: @@ -136,8 +147,6 @@ if [ -z "$SKIP_PAZPAR2" ] ; then rm -f ${PREFIX}_pazpar2.log fi -CFG=${PREFIX}.cfg -URLS=${PREFIX}.urls VALGRINDLOG=${PREFIX}_valgrind.log if test `uname` = "Linux"; then -- 1.7.10.4