From 6507d6070b6d5b3e1aabde4c32a76f86046e5046 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Tue, 15 May 2007 08:56:03 +0000 Subject: [PATCH] Begin work on PP2 WS HTTP test. --- src/Makefile.am | 7 +++++-- src/test_http.cfg | 26 ++++++++++++++++++++++++++ src/test_http.sh | 22 ++++++++++++++++++++++ src/test_http.xml | 28 ++++++++++++++++++++++++++++ 4 files changed, 81 insertions(+), 2 deletions(-) create mode 100644 src/test_http.cfg create mode 100755 src/test_http.sh create mode 100644 src/test_http.xml diff --git a/src/Makefile.am b/src/Makefile.am index fde2a7f..21f2e53 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.20 2007-05-10 11:46:09 adam Exp $ +# $Id: Makefile.am,v 1.21 2007-05-15 08:56:03 adam Exp $ bin_PROGRAMS = pazpar2 check_PROGRAMS = test_config \ @@ -8,8 +8,11 @@ check_PROGRAMS = test_config \ test_relevance \ test_sel_thread +check_SCRIPTS = test_http.sh -TESTS = $(check_PROGRAMS) +EXTRA_DIST = test_http.xml test_http.cfg $(check_SCRIPTS) + +TESTS = $(check_PROGRAMS) $(check_SCRIPTS) noinst_LIBRARIES = libpazpar2.a diff --git a/src/test_http.cfg b/src/test_http.cfg new file mode 100644 index 0000000..ec07815 --- /dev/null +++ b/src/test_http.cfg @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/test_http.sh b/src/test_http.sh new file mode 100755 index 0000000..ed76cc6 --- /dev/null +++ b/src/test_http.sh @@ -0,0 +1,22 @@ +#!/bin/sh +# $Id: test_http.sh,v 1.1 2007-05-15 08:56:03 adam Exp $ +srcdir=${srcdir:-"."} +./pazpar2 -f ${srcdir}/test_http.cfg -t ${srcdir}/test_http.xml >test_http.log 2>&1 & +PP2PID=$! +sleep 1 +if ps -p $PP2PID >/dev/null 2>&1; then + : + # echo "Started OK PID=$PP2PID" +else + echo "pazpar2 failed to start" + exit 1 +fi + +kill $PP2PID +exit 0 + +# Local Variables: +# mode:shell-script +# sh-indentation: 2 +# sh-basic-offset: 4 +# End: diff --git a/src/test_http.xml b/src/test_http.xml new file mode 100644 index 0000000..5f5a905 --- /dev/null +++ b/src/test_http.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- 1.7.10.4