You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2006/12/21 17:48:18 UTC

svn commit: r489404 - in /incubator/qpid/branches/event-queue-2006-12-20/cpp/tests: Makefile.am broker env run-system-tests topicall

Author: aconway
Date: Thu Dec 21 08:48:18 2006
New Revision: 489404

URL: http://svn.apache.org/viewvc?view=rev&rev=489404
Log:
cpp/tests: remmoved redundant scripts, get topictest running in VPATH build.

Removed:
    incubator/qpid/branches/event-queue-2006-12-20/cpp/tests/broker
    incubator/qpid/branches/event-queue-2006-12-20/cpp/tests/env
    incubator/qpid/branches/event-queue-2006-12-20/cpp/tests/topicall
Modified:
    incubator/qpid/branches/event-queue-2006-12-20/cpp/tests/Makefile.am
    incubator/qpid/branches/event-queue-2006-12-20/cpp/tests/run-system-tests

Modified: incubator/qpid/branches/event-queue-2006-12-20/cpp/tests/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/event-queue-2006-12-20/cpp/tests/Makefile.am?view=diff&rev=489404&r1=489403&r2=489404
==============================================================================
--- incubator/qpid/branches/event-queue-2006-12-20/cpp/tests/Makefile.am (original)
+++ incubator/qpid/branches/event-queue-2006-12-20/cpp/tests/Makefile.am Thu Dec 21 08:48:18 2006
@@ -9,11 +9,7 @@
   -I$(top_srcdir)/lib/common/framing	\
   $(APR_CXXFLAGS)
 
-# FIXME: have e.g., topicall, run as part of "make check"?
 EXTRA_DIST =		\
-  env			\
-  broker		\
-  topicall		\
   topictest		\
   qpid_test_plugin.h	\
   MockSessionHandler.h

Modified: incubator/qpid/branches/event-queue-2006-12-20/cpp/tests/run-system-tests
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/event-queue-2006-12-20/cpp/tests/run-system-tests?view=diff&rev=489404&r1=489403&r2=489404
==============================================================================
--- incubator/qpid/branches/event-queue-2006-12-20/cpp/tests/run-system-tests (original)
+++ incubator/qpid/branches/event-queue-2006-12-20/cpp/tests/run-system-tests Thu Dec 21 08:48:18 2006
@@ -6,7 +6,7 @@
 ../src/qpidd > $log 2>&1 & pid=$!
 
 # Arrange to kill the daemon upon any type of termination.
-trap 'status=$?; kill $pid; exit $status' 0
+trap 'status=$?; kill $pid; rm -f test.out; exit $status' 0
 trap '(exit $?); exit $?' 1 2 13 15
 
 # Run C++ client tests.
@@ -24,7 +24,7 @@
 }
 
 run_test ./client_test
-run_test ./topictest -s2 -m2 -b1
+run_test `dirname $0`/topictest -s2 -m2 -b1
 
 # Run the python tests.
 if test -d ../../python ;  then