test: refactor a lot of test suite related stuff.

.gitignore

@@ -24,6 +24,14 @@ stamp-*
 *-stamp
 INSTALL
 caca-config
+# Testsuite binaries
+caca/t/bench
+caca/t/caca-test
+caca/t/simple
+caca/t/*.log
+caca/t/*.trs
+ruby/*.log
+ruby/*.trs
 # caca-sharp binaries
 caca-sharp/*.dll
 caca-sharp/*.config
@@ -88,10 +96,6 @@ src/cacaplay
 src/cacaserver
 src/cacaclock
 src/img2txt
-# Testsuite binaries
-test/bench
-test/caca-test
-test/simple
 # Tools binaries
 tools/optipal
 tools/makefont

Makefile.am

@@ -1,7 +1,6 @@
 
 SUBDIRS = kernel caca src examples tools \
-          cxx caca-sharp python ruby java \
-          doc test
+          cxx caca-sharp python ruby java doc
 DIST_SUBDIRS = $(SUBDIRS) win32
 
 EXTRA_DIST = NOTES COPYING.GPL COPYING.ISC COPYING.LGPL bootstrap build-dos build-kernel build-win32 build-win64 caca-config.in libcaca.spec libcaca.sln

caca/Makefile.am

@@ -1,4 +1,6 @@
 
+SUBDIRS = . t
+
 EXTRA_DIST = caca.pc.in \
              mono9.data monobold12.data \
              libcaca.vcxproj libcaca.def

test/Makefile.am → caca/t/Makefile.am

@@ -1,5 +1,5 @@
 
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/caca -I../caca
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/caca -I..
 
 if USE_CPPUNIT
 cppunit_tests = caca-test
@@ -16,12 +16,12 @@ TESTS = simple check-copyright check-source check-win32 \
         $(doxygen_tests) $(cppunit_tests)
 
 simple_SOURCES = simple.c
-simple_LDADD = ../caca/libcaca.la
+simple_LDADD = ../libcaca.la
 
 bench_SOURCES = bench.c
-bench_LDADD = ../caca/libcaca.la
+bench_LDADD = ../libcaca.la
 
 caca_test_SOURCES = caca-test.cpp canvas.cpp dirty.cpp driver.cpp export.cpp
 caca_test_CXXFLAGS = $(CPPUNIT_CFLAGS)
-caca_test_LDADD = ../caca/libcaca.la $(CPPUNIT_LIBS)
+caca_test_LDADD = ../libcaca.la $(CPPUNIT_LIBS)
 

caca/t/check-doxygen

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+#
+# Check for Doxygen warnings
+#
+nfiles="$(grep -c "Parsing file" < ../../doc/doxygen.log)"
+if nfails="$(grep -c Warning: ../../doc/doxygen.log 2>/dev/null)"; then
+  grep Warning: ../../doc/doxygen.log | sed 's/\(.\{75\}\)...*/\1 .../'
+fi
+
+echo "$nfiles files, $nfails visible errors in documentation"
+
+if test "$nfails" != "0"; then
+  exit 1
+fi
+
+exit 0
+

configure.ac

@@ -555,9 +555,9 @@ AC_CONFIG_FILES(
  [Makefile
   kernel/Makefile
   caca/Makefile
+  caca/t/Makefile
   src/Makefile
   examples/Makefile
-  test/Makefile
   tools/Makefile
   java/Makefile
   caca-sharp/Makefile

test/check-doxygen

@@ -1,18 +0,0 @@
-#!/bin/sh
-
-#
-# Check for Doxygen warnings
-#
-nfiles="$(grep -c "Parsing file" < ../doc/doxygen.log)"
-if nfails="$(grep -c Warning: ../doc/doxygen.log 2>/dev/null)"; then
-  grep Warning: ../doc/doxygen.log | sed 's/\(.\{75\}\)...*/\1 .../'
-fi
-
-echo "$nfiles files, $nfails visible errors in documentation"
-
-if test "$nfails" != "0"; then
-  exit 1
-fi
-
-exit 0
-