Changeset 2301 for libcacaTweet

Timestamp:

Apr 19, 2008, 4:07:54 PM (15 years ago)

Author:

Sam Hocevar

Message:

• Use CppUnit? for C and C++ unit tests. Sorry, Jylam.

Location:

libcaca/trunk

Files:

• configure.ac (modified) (2 diffs)
• tests/.gitignore (modified) (1 diff)
• tests/Makefile.am (modified) (1 diff)
• tests/canvas.cpp (added)
• tests/cucul-test.cpp (added)

libcaca/trunk/configure.ac

@@ -85 +85 @@
 AC_ARG_ENABLE(doc,
   [  --enable-doc            build documentation (needs doxygen and LaTeX)])
+AC_ARG_ENABLE(cppunit,
+  [  --enable-cppunit        use cppunit for unit tests (autodetected)])
 AC_ARG_ENABLE(zzuf,
   [  --enable-zzuf           use zzuf for fuzzing tests (autodetected)])
@@ -452 +454 @@
 AM_CONDITIONAL(USE_LATEX, test "${LATEX}" != "no")
 
+# Use cppunit for unit tests?
+CPPUNIT="no"
+PKG_CHECK_MODULES(CPPUNIT, cppunit, [CPPUNIT="yes"], [AC_MSG_RESULT(no)])
+AM_CONDITIONAL(USE_CPPUNIT, test "$CPPUNIT" != "no")
+
 # Use zzuf for fuzzing tests?
 ZZUF="no"

libcaca/trunk/tests/.gitignore

@@ -1 +1 @@
 simple
+cucul-test

libcaca/trunk/tests/Makefile.am

@@ -3 +3 @@
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/cucul -I../cucul
 
-TESTS = simple
+if USE_CPPUNIT
+cppunit_tests = cucul-test
+endif
 
-check_PROGRAMS = simple
+noinst_PROGRAMS = simple $(cppunit_tests)
+
+TESTS = $(noinst_PROGRAMS)
 
 simple_SOURCES = simple.c
 simple_LDADD = ../cucul/libcucul.la
 
+cucul_test_SOURCES = cucul-test.cpp canvas.cpp
+cucul_test_CPPFLAGS = $(CPPUNIT_CFLAGS)
+cucul_test_LDADD = ../cucul/libcucul.la $(CPPUNIT_LIBS)
+