[Mockpp-commits] mockpp/mockpp/tests .cvsignore,1.1.1.1,1.2 Makefile.am,1.74,1.75
Brought to you by:
ewald-arnold
Menu
▾
▴
[Mockpp-commits] mockpp/mockpp/tests .cvsignore,1.1.1.1,1.2 Makefile.am,1.74,1.75
|
From: Ewald A. <ewa...@us...> - 2005-05-07 17:01:07
|
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5936/mockpp/tests Modified Files: .cvsignore Makefile.am Log Message: cleanup Index: .cvsignore =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/.cvsignore,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- .cvsignore 22 Dec 2002 09:57:53 -0000 1.1.1.1 +++ .cvsignore 7 May 2005 17:00:57 -0000 1.2 @@ -1,4 +1,5 @@ *.directory +check_inst.cpp Makefile Makefile.in *.~* Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Makefile.am,v retrieving revision 1.74 retrieving revision 1.75 diff -u -d -r1.74 -r1.75 --- Makefile.am 6 May 2005 14:23:05 -0000 1.74 +++ Makefile.am 7 May 2005 17:00:57 -0000 1.75 @@ -2,6 +2,20 @@ CLEANFILES = *.~* *.~~* *~ +########################################################################### + +AM_LDFLAGS = $(all_libraries) + +check_PROGRAMS = jmock_test mock_test readability_test check_inst + +SINGLE_TESTS = $(check_PROGRAMS) + +TESTS = $(SINGLE_TESTS) + +.PHONY: check_inst.cpp + +########################################################################### + mock_test_LDADD = $(top_builddir)/mockpp/libmockpp.la \ $(LIBDL) -lstdc++ $(EA_EXTRA_LIB) $(LIBCPPUNIT) @@ -11,13 +25,10 @@ readability_test_LDADD = $(top_builddir)/mockpp/libmockpp.la \ $(LIBDL) -lstdc++ $(EA_EXTRA_LIB) $(LIBCPPUNIT) -AM_LDFLAGS = $(all_libraries) - -check_PROGRAMS = jmock_test mock_test readability_test - -SINGLE_TESTS = $(check_PROGRAMS) +check_inst_LDADD = $(top_builddir)/mockpp/libmockpp.la \ + $(LIBDL) -lstdc++ $(EA_EXTRA_LIB) $(LIBCPPUNIT) -TESTS = $(SINGLE_TESTS) +########################################################################### raw-gen: cpp -DHAVE_CPPUNIT -DHAVE_CONFIG_H $(srcdir)/InvocationMocker_test.cpp $(INCLUDES) >x.cpp @@ -27,10 +38,11 @@ indent xx.cpp g++ xx.cpp -o xx +########################################################################### mock_test_SOURCES = mock_test.cpp VisitableMockObject_test.cpp \ - Formatter_test.cpp Throwable_test.cpp ThrowableList_test.cpp ExpectationCounter_test.cpp \ - ExpectationCounterRange_test.cpp ExpectationMap_test.cpp ExpectationList_test.cpp \ + Formatter_test.cpp Throwable_test.cpp ThrowableList_test.cpp ExpectationCounter_test.cpp \ + ExpectationCounterRange_test.cpp ExpectationMap_test.cpp ExpectationList_test.cpp \ ConstraintList_test.cpp ExpectationSet_test.cpp ExpectationConglomeration_test.cpp \ ExpectationSegment_test.cpp ExpectationValue_test.cpp ExpectationBoundary_test.cpp \ Verifiable_test.cpp Exception_test.cpp mockpp_test.cpp ReturnObjectList_test.cpp \ @@ -39,41 +51,53 @@ VisitableMockObject_4_test.cpp VisitableMockObject_5_test.cpp VisitableMockObject_void_test.cpp \ VisitableMockObject_1_void_test.cpp VisitableMockObject_2_void_test.cpp \ VisitableMockObject_3_void_test.cpp VisitableMockObject_4_void_test.cpp \ - VisitableMockObject_5_void_test.cpp VerifyingTestCase_test.cpp classes_ABCDE.cpp \ - VerifyingTestCaller_test.cpp TrackingCounter_test.cpp MixedMockObject_5_test.cpp TimeServer_test.cpp - -mock_test_count: - list=mock_test.files; \ - test -f $$list && rm $$list; \ - for f in $(mock_test_SOURCES); do \ - echo $$f >> $$list.tmp; \ - done; \ - cat $$list.tmp | wc -l ; echo "Dateien in mock_test"; \ - cat $$list.tmp | sort >$$list + VisitableMockObject_5_void_test.cpp VerifyingTestCase_test.cpp classes_ABCDE.cpp \ + VerifyingTestCaller_test.cpp TrackingCounter_test.cpp MixedMockObject_5_test.cpp TimeServer_test.cpp jmock_test_SOURCES = And_test.cpp IsAnything_test.cpp IsCloseTo_test.cpp \ - IsEqual_test.cpp IsGreaterOrEqual_test.cpp IsGreaterThan_test.cpp IsInstanceOf_test.cpp \ - IsLessOrEqual_test.cpp IsLessThan_test.cpp IsNot_test.cpp IsNothing_test.cpp IsSame_test.cpp \ - Or_test.cpp ReturnStub_test.cpp StringContains_test.cpp StubSequence_test.cpp \ - TestFailureStub_test.cpp ThrowStub_test.cpp VoidStub_test.cpp ChainingMockObjectSupport_test.cpp \ - CustomStub_test.cpp DefaultResultStub_test.cpp mock_test.cpp Invocation_test.cpp \ - AnyArgumentsMatcher_test.cpp InvokedRecorder_test.cpp InvokeAtLeastOnceMatcher_test.cpp \ - InvokeOnceMatcher_test.cpp InvokeCountMatcher_test.cpp InvokedAfterMatcher_test.cpp \ - TestFailureMatcher_test.cpp NoArgumentsMatcher_test.cpp ArgumentsMatcher_test.cpp \ - ConstraintSet_test.cpp ArgumentsMatchBuilder_test.cpp InvocationMockerBuilder_test.cpp \ - AbstractDynamicChainingMock_test.cpp AbstractInvocationDispatcher_test.cpp ChainingMockBuilder_test.cpp \ - CoreMock_test.cpp DynamicChainingMockError_test.cpp FIFOInvocationDispatcher_test.cpp \ - InvocationMocker_test.cpp LIFOInvocationDispatcher_test.cpp InvokeAtMostMatcher_test.cpp \ - InvokedBeforeMatcher_test.cpp StubBuilder_test.cpp MatchBuilder_test.cpp \ - InvokeAtLeastMatcher_test.cpp classes_ABCDE.cpp ChainableMockObject_1_test.cpp \ - ChainableMockObject_1_void_test.cpp ChainableMockObject_2_test.cpp ChainableMockObject_2_void_test.cpp \ - ChainableMockObject_3_test.cpp ChainableMockObject_3_void_test.cpp ChainableMockObject_4_test.cpp \ - ChainableMockObject_4_void_test.cpp ChainableMockObject_5_test.cpp ChainableMockObject_5_void_test.cpp \ - ChainableMockObject_test.cpp ChainableMockObject_void_test.cpp TypelessStubSequence_test.cpp \ - StringEndsWith_test.cpp StringStartsWith_test.cpp UnlimitedMatcher_test.cpp mockpp_pti_test.cpp + IsEqual_test.cpp IsGreaterOrEqual_test.cpp IsGreaterThan_test.cpp IsInstanceOf_test.cpp \ + IsLessOrEqual_test.cpp IsLessThan_test.cpp IsNot_test.cpp IsNothing_test.cpp IsSame_test.cpp \ + Or_test.cpp ReturnStub_test.cpp StringContains_test.cpp StubSequence_test.cpp \ + TestFailureStub_test.cpp ThrowStub_test.cpp VoidStub_test.cpp ChainingMockObjectSupport_test.cpp \ + CustomStub_test.cpp DefaultResultStub_test.cpp mock_test.cpp Invocation_test.cpp \ + AnyArgumentsMatcher_test.cpp InvokedRecorder_test.cpp InvokeAtLeastOnceMatcher_test.cpp \ + InvokeOnceMatcher_test.cpp InvokeCountMatcher_test.cpp InvokedAfterMatcher_test.cpp \ + TestFailureMatcher_test.cpp NoArgumentsMatcher_test.cpp ArgumentsMatcher_test.cpp \ + ConstraintSet_test.cpp ArgumentsMatchBuilder_test.cpp InvocationMockerBuilder_test.cpp \ + AbstractDynamicChainingMock_test.cpp AbstractInvocationDispatcher_test.cpp ChainingMockBuilder_test.cpp \ + CoreMock_test.cpp DynamicChainingMockError_test.cpp FIFOInvocationDispatcher_test.cpp \ + InvocationMocker_test.cpp LIFOInvocationDispatcher_test.cpp InvokeAtMostMatcher_test.cpp \ + InvokedBeforeMatcher_test.cpp StubBuilder_test.cpp MatchBuilder_test.cpp \ + InvokeAtLeastMatcher_test.cpp classes_ABCDE.cpp ChainableMockObject_1_test.cpp \ + ChainableMockObject_1_void_test.cpp ChainableMockObject_2_test.cpp ChainableMockObject_2_void_test.cpp \ + ChainableMockObject_3_test.cpp ChainableMockObject_3_void_test.cpp ChainableMockObject_4_test.cpp \ + ChainableMockObject_4_void_test.cpp ChainableMockObject_5_test.cpp ChainableMockObject_5_void_test.cpp \ + ChainableMockObject_test.cpp ChainableMockObject_void_test.cpp TypelessStubSequence_test.cpp \ + StringEndsWith_test.cpp StringStartsWith_test.cpp UnlimitedMatcher_test.cpp mockpp_pti_test.cpp readability_test_SOURCES = readability_test.cpp classes_ABCDE.cpp +check_inst_SOURCES = check_inst.cpp + +noinst_HEADERS = classes_ABCDE.h MyBuilderNamespace.h MyMatchBuilder.h + +#compilecheck_SOURCES = compilecheck.cpp + +########################################################################### + +#compilecheck_LDADD = $(top_builddir)/mockpp/libmockpp.la $(EA_EXTRA_LIB) \ +# $(LIBCPPUNIT) -lstdc++ + +jmock_test_LDFLAGS = -L/opt/intel_cc_80/lib + +mock_test_LDFLAGS = -L/opt/intel_cc_80/lib + +readability_test_LDFLAGS = -L/opt/intel_cc_80/lib + +check_inst_LDFLAGS = -L/opt/intel_cc_80/lib + +########################################################################### + jmock_test_count: list=jmock_test.files; \ test -f $$list && rm $$list; \ @@ -83,7 +107,16 @@ cat $$list.tmp | wc -l ; echo "Dateien in jmock_test"; \ cat $$list.tmp | sort >$$list -#compilecheck_SOURCES = compilecheck.cpp +mock_test_count: + list=mock_test.files; \ + test -f $$list && rm $$list; \ + for f in $(mock_test_SOURCES); do \ + echo $$f >> $$list.tmp; \ + done; \ + cat $$list.tmp | wc -l ; echo "Dateien in mock_test"; \ + cat $$list.tmp | sort >$$list + +########################################################################### VALGRIND_OPTS=--show-reachable=yes --leak-check=yes -v VG_SUPPRESS=vg-suppress-`hostname`.txt @@ -106,13 +139,17 @@ done; echo "Store all the suppression block to $(srcdir)/$(VG_SUPPRESS)" -#compilecheck_LDADD = $(top_builddir)/mockpp/libmockpp.la $(EA_EXTRA_LIB) \ -# $(LIBCPPUNIT) -lstdc++ - -jmock_test_LDFLAGS = -L/opt/intel_cc_80/lib - -mock_test_LDFLAGS = -L/opt/intel_cc_80/lib +########################################################################### -readability_test_LDFLAGS = -L/opt/intel_cc_80/lib +check_inst.cpp: + echo "/*" >check_inst.cpp + (N=`pwd`/check_inst.cpp; cd $(srcdir)/../..; find . -name "*.h" \ + | grep -v "config" | grep -v "/tests/" | grep -v "/docs/" | grep -v "/examples/" \ + | sed -e "s,\./,#include <,g" -e "s/\.h/\.h>/g" >>$$N) + echo "*/" >>check_inst.cpp + echo "int main()" >>check_inst.cpp + echo "{" >>check_inst.cpp + echo " return 0;" >>check_inst.cpp + echo "}" >>check_inst.cpp + cp check_inst.cpp $(srcdir) -noinst_HEADERS = classes_ABCDE.h MyBuilderNamespace.h MyMatchBuilder.h |
