summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBaptiste Lepilleur <gaiacrtn@free.fr>2002-04-18 09:05:00 +0000
committerBaptiste Lepilleur <gaiacrtn@free.fr>2002-04-18 09:05:00 +0000
commit24cab9efdce91f68cfbe687f5fdd203256ea38f9 (patch)
tree81cd5cf96f027aa309eebe45f8d4bc23b207a2cc
parent0c7fb5f279e56f26a04d6d390150d8b6b456769e (diff)
downloadcppunit-24cab9efdce91f68cfbe687f5fdd203256ea38f9.tar.gz
Configure.
configure.in: added some makefile.am * contrib/readme.txt: updated. * contrib/bc5/bc5-makefile.zip: added borland 5.5 makefile. Contributed by project cuppa.
-rw-r--r--configure.in7
-rw-r--r--contrib/xml-xsl/tests.xml6
-rw-r--r--include/cppunit/Makefile.am2
-rw-r--r--src/DllPlugInTester/Makefile.am2
-rw-r--r--src/cppunit/Makefile.am4
-rw-r--r--src/cppunit/cppunit.dsp4
6 files changed, 18 insertions, 7 deletions
diff --git a/configure.in b/configure.in
index 477ddd2..e3e70c7 100644
--- a/configure.in
+++ b/configure.in
@@ -95,11 +95,14 @@ AC_ARG_ENABLE(test-plugin,
enable_test_plugin=${enable_test_plugin_default-yes}
fi
if test "$enable_test_plugin" = no; then
+echo "test-plug in disabled"
+ fi
+])
+
+
testplugin_val=1
AC_DEFINE_UNQUOTED(NO_TESTPLUGIN,$testplugin_val,
[defined to disable TestPlugIn])
- fi
-])
AC_OUTPUT([
diff --git a/contrib/xml-xsl/tests.xml b/contrib/xml-xsl/tests.xml
index 3cea34b..6fef14e 100644
--- a/contrib/xml-xsl/tests.xml
+++ b/contrib/xml-xsl/tests.xml
@@ -9,7 +9,11 @@
<File>exampletestcase.cpp</File>
<Line>7</Line>
</Location>
- <Message>Expected: 1, but was: 1.1.</Message>
+ <Message>- Expected : { 0; 7; 8; 9; 10; 11; 1; 2; 3; 4; 5; 6; 12; 13; 14; 15; 16; 17; 18; 19 }
+- Actual : { 0; 1; 2; 3; 4; 5; 7; 8; 9; 10; 11; 6; 12; 13; 14; 15; 16; 17; 18; 19 }
+- Difference at index 1
+->Expected : { 7; 8; 9; 10; 11; 1; 2; 3; 4; 5; 6; 12; 13; 14; 15; 16; 17; 18; 19 }
+->Actual : { 1; 2; 3; 4; 5; 7; 8; 9; 10; 11; 6; 12; 13; 14; 15; 16; 17; 18; 19 }</Message>
</FailedTest>
<FailedTest id="2">
<Name>ExampleTestCase.anotherExample</Name>
diff --git a/include/cppunit/Makefile.am b/include/cppunit/Makefile.am
index 4b7766b..8cebcf8 100644
--- a/include/cppunit/Makefile.am
+++ b/include/cppunit/Makefile.am
@@ -6,6 +6,7 @@ libcppunitincludedir = $(includedir)/cppunit
libcppunitinclude_HEADERS = \
config-auto.h \
Asserter.h \
+ BriefTestProgressListener.h \
CompilerOutputter.h \
Exception.h \
NotEqualException.h \
@@ -32,7 +33,6 @@ libcppunitinclude_HEADERS = \
TextTestResult.h \
TextTestRunner.h \
TestListener.h \
- VerboseTestProgressListener.h \
XmlOutputter.h
dist-hook:
diff --git a/src/DllPlugInTester/Makefile.am b/src/DllPlugInTester/Makefile.am
index d6497b4..1594e11 100644
--- a/src/DllPlugInTester/Makefile.am
+++ b/src/DllPlugInTester/Makefile.am
@@ -7,5 +7,5 @@ bin_PROGRAMS=DllPlugInTester
DllPlugInTester_SOURCES= DllPlugInTester.cpp
DllPlugInTester_LDADD= \
- $(top_builddir)/src/cppunit/libcppunit.la
+ $(top_builddir)/src/cppunit/libcppunit.la ld.so
diff --git a/src/cppunit/Makefile.am b/src/cppunit/Makefile.am
index 82b2ada..44a925f 100644
--- a/src/cppunit/Makefile.am
+++ b/src/cppunit/Makefile.am
@@ -1,5 +1,5 @@
#
-# $Id: Makefile.am,v 1.28 2002-04-18 09:56:17 blep Exp $
+# $Id: Makefile.am,v 1.29 2002-04-18 09:58:57 blep Exp $
#
EXTRA_DIST = cppunit.dsp cppunit_dll.dsp DllMain.cpp
@@ -10,6 +10,7 @@ lib_LTLIBRARIES = libcppunit.la
libcppunit_la_SOURCES = \
Asserter.cpp \
BeOsDynamicLibraryManager.cpp \
+ BriefTestProgressListener.cpp \
CompilerOutputter.cpp \
DynamicLibraryManager.cpp \
DynamicLibraryManagerException.cpp \
@@ -40,7 +41,6 @@ libcppunit_la_SOURCES = \
TextTestRunner.cpp \
TypeInfoHelper.cpp \
UnixDynamicLibraryManager.cpp \
- VerboseTestProgressListener.cpp \
XmlOutputter.cpp \
Win32DynamicLibraryManager.cpp
diff --git a/src/cppunit/cppunit.dsp b/src/cppunit/cppunit.dsp
index 344a25a..bd6e7af 100644
--- a/src/cppunit/cppunit.dsp
+++ b/src/cppunit/cppunit.dsp
@@ -519,6 +519,10 @@ SOURCE=..\..\include\cppunit\Makefile.am
# End Source File
# Begin Source File
+SOURCE=..\..\include\cppunit\plugin\Makefile.am
+# End Source File
+# Begin Source File
+
SOURCE=.\Makefile.am
# End Source File
# End Target