[Mockpp-commits] mockpp/mockpp/tests Makefile.am,1.99,1.100

[Ewald A. <ewa...@us...>]

Update of /cvsroot/mockpp/mockpp/mockpp/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12517/mockpp/tests

Modified Files:
	Makefile.am 
Log Message:
merged test files

Index: Makefile.am
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Makefile.am,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- Makefile.am	1 Jan 2006 10:27:22 -0000	1.99
+++ Makefile.am	9 Jan 2006 09:41:18 -0000	1.100
@@ -18,7 +18,6 @@
 endif
 
 check_PROGRAMS = mock_test  \
-                 jmock_test \
                  $(x11_app) $(qt_app) $(win32_app) \
                  readability_test check_inst
 
@@ -58,9 +57,6 @@
 mock_test_LDADD = $(top_builddir)/mockpp/libmockpp.la \
 	$(cxxtest_lib) $(LIBDL) -lstdc++ $(EA_EXTRA_LIB) $(LIBBOOST)
 
-jmock_test_LDADD = $(top_builddir)/mockpp/libmockpp.la \
-	$(cxxtest_lib) $(LIBDL) -lstdc++ $(EA_EXTRA_LIB) $(LIBBOOST)
-
 readability_test_LDADD = $(top_builddir)/mockpp/libmockpp.la \
 	$(cxxtest_lib) $(LIBDL) -lstdc++ $(EA_EXTRA_LIB)
 
@@ -94,9 +90,7 @@
 	VisitableMockObject_5_void_test.cpp VerifyingTestCase_test.cpp classes_ABCDE.cpp \
 	VerifyingTestCaller_test.cpp TrackingCounter_test.cpp MixedMockObject_5_test.cpp TimeServer_test.cpp \
 	VisitableMockMethod_2_test.cpp VisitableMockMethod_1_test.cpp VisitableMockMethod_test.cpp \
-	ResponseVector_test.cpp NoException_test.cpp
-
-libjmocktesting_la_SOURCES = \
+	ResponseVector_test.cpp NoException_test.cpp \
 	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 \
@@ -111,7 +105,7 @@
 	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 \
+	InvokeAtLeastMatcher_test.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 \
@@ -134,8 +128,6 @@
 
 mock_test_SOURCES  = mock_test.cpp $(libmocktesting_la_SOURCES)
 
-jmock_test_SOURCES = mock_test.cpp $(libjmocktesting_la_SOURCES)
-
 readability_test_SOURCES = readability_test.cpp classes_ABCDE.cpp
 
 check_inst_SOURCES = check_inst.cpp
@@ -144,8 +136,6 @@
 
 ###########################################################################
 
-jmock_test_LDFLAGS = -L/opt/intel_cc_80/lib
-
 mock_test_LDFLAGS = -L/opt/intel_cc_80/lib
 
 if WORKING_QT
@@ -166,15 +156,6 @@
 
 ###########################################################################
 
-jmock_test_count:
-	list=jmock_test.files; \
-	test -f $$list && rm $$list; \
-	for f in $(jmock_test_SOURCES); do \
-	  echo $$f >> $$list.tmp; \
-	done; \
-	cat $$list.tmp | wc -l ; echo "Dateien in jmock_test"; \
-	cat $$list.tmp | sort >$$list
-
 mock_test_count:
 	list=mock_test.files; \
 	test -f $$list && rm $$list; \
@@ -189,11 +170,6 @@
 VALGRIND_OPTS=--show-reachable=yes --leak-check=yes -v
 VG_SUPPRESS=vg-suppress-`hostname`.txt
 
-vg-jmock:
-	-rm *vglog*
-	LD_LIBRARY_PATH=../.libs  valgrind --tool=memcheck $(VALGRIND_OPTS) --logfile=jmock.vglog ./.libs/lt-jmock_test; \
-	grep "mock[^/]" *vglog* || cat *vglog*
-
 # --suppressions=$(srcdir)/$(VG_SUPPRESS)
  vg-mock:
 	-rm *vglog*