You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gs...@apache.org on 2006/12/11 11:41:16 UTC
svn commit: r485592 - in /incubator/qpid/trunk/qpid/cpp/tests: Makefile.am
run-python-tests run-unit-tests
Author: gsim
Date: Mon Dec 11 02:41:13 2006
New Revision: 485592
URL: http://svn.apache.org/viewvc?view=rev&rev=485592
Log:
Patch posted to dev listed:
2006-12-08 Jim Meyering <me...@redhat.com>
Move each test into a script of its own, as Automake requires.
* tests/Makefile.am (TESTS): List test script names here,
rather than listing rules as dependents of "check".
(EXTRA_DIST): Add $(TESTS).
(run-unit-tests, run-python-tests): Remove rules, putting their
contents in the following new scripts.
* tests/run-unit-tests: New one-line script.
* tests/run-python-tests: New script, containing the script
from Makefile.am.
Added:
incubator/qpid/trunk/qpid/cpp/tests/run-python-tests (with props)
incubator/qpid/trunk/qpid/cpp/tests/run-unit-tests (with props)
Modified:
incubator/qpid/trunk/qpid/cpp/tests/Makefile.am
Modified: incubator/qpid/trunk/qpid/cpp/tests/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/tests/Makefile.am?view=diff&rev=485592&r1=485591&r2=485592
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/tests/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/tests/Makefile.am Mon Dec 11 02:41:13 2006
@@ -64,17 +64,8 @@
noinst_PROGRAMS = $(client_tests)
-check: run-unit-tests run-python-tests
-
-.PHONY: run-unit-tests
-run-unit-tests: $(check_LTLIBRARIES)
- DllPlugInTester -c -b .libs/*.so
-
-run-python-tests: $(check_LTLIBRARIES) ../src/qpidd
- ../src/qpidd > qpidd.log 2>&1 & pid=$$!; \
- trap 'status=$$?; kill $$pid; exit $$status' 0; \
- trap '(exit $$?); exit $$?' 1 2 13 15; \
- cd ../../python ; ./run-tests -v -I cpp_failing.txt
+TESTS = run-unit-tests run-python-tests
+EXTRA_DIST += $(TESTS)
include gen.mk
Added: incubator/qpid/trunk/qpid/cpp/tests/run-python-tests
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/tests/run-python-tests?view=auto&rev=485592
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/tests/run-python-tests (added)
+++ incubator/qpid/trunk/qpid/cpp/tests/run-python-tests Mon Dec 11 02:41:13 2006
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+log=`pwd`/qpidd.log
+# Start the daemon, recording its PID.
+../src/qpidd > $log 2>&1 & pid=$!
+
+# Arrange to kill the daemon upon any type of termination.
+trap 'status=$?; kill $pid; exit $status' 0
+trap '(exit $?); exit $?' 1 2 13 15
+
+# Run the tests.
+cd ../../python && ./run-tests -v -I cpp_failing.txt
+
+rm -f $log
Propchange: incubator/qpid/trunk/qpid/cpp/tests/run-python-tests
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/qpid/trunk/qpid/cpp/tests/run-unit-tests
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/tests/run-unit-tests?view=auto&rev=485592
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/tests/run-unit-tests (added)
+++ incubator/qpid/trunk/qpid/cpp/tests/run-unit-tests Mon Dec 11 02:41:13 2006
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+DllPlugInTester -c -b .libs/*.so
Propchange: incubator/qpid/trunk/qpid/cpp/tests/run-unit-tests
------------------------------------------------------------------------------
svn:executable = *