Add a tests/ directory to keep tests in

Note the tests that are there now aren't really suited for
automated testing, so make check is hosed right now

diff --git a/configure.ac b/configure.ac
index e5a626fe19511df75d3b18fe47fcf37cd1e83a10..505135b28216b8f9209f1284710a29bdd1d8d8dd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -27,8 +27,8 @@ ALL_LINGUAS=""
 IT_PROG_INTLTOOL
 PKG_PROG_PKG_CONFIG
 
-PKG_CHECK_MODULES(PLYMOUTH, [glib-2.0   >= 2.12.11 
-                             cairo      >= 1.4.2   
+PKG_CHECK_MODULES(PLYMOUTH, [libpng >= 1.2.16
+                             
 ]) 
 AC_SUBST(PLYMOUTH_CFLAGS)
 AC_SUBST(PLYMOUTH_LIBS)
@@ -37,5 +37,6 @@ AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
 
 AC_OUTPUT([Makefile
            src/Makefile
+           src/tests/Makefile
            po/Makefile.in
 ])

diff --git a/src/Makefile.am b/src/Makefile.am
index 759a90c46028df0f164243f49f506c73726497a4..01d1289a6b9daf74e414afb0131dae202bf86f1d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,4 @@
+SUBDIRS = tests
 INCLUDES = -I$(top_srcdir)                                                    \
            -I$(srcdir)
 

diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
new file mode 100644 (file)
index 0000000..7c4d973
--- /dev/null
+++ b/src/tests/Makefile.am
@@ -0,0 +1,12 @@
+INCLUDES =                                                                    \
+           -I$(top_srcdir)                                                    \
+           -I$(srcdir)/..                                                     \
+           -I$(srcdir)
+TESTS = 
+
+include $(srcdir)/ply-frame-buffer-test.am
+include $(srcdir)/ply-image-test.am
+include $(srcdir)/ply-terminal-test.am
+include $(srcdir)/ply-init-control-test.am
+
+noinst_PROGRAMS = $(TESTS)

diff --git a/src/tests/ply-frame-buffer-test.am b/src/tests/ply-frame-buffer-test.am
new file mode 100644 (file)
index 0000000..d480c0e
--- /dev/null
+++ b/src/tests/ply-frame-buffer-test.am
@@ -0,0 +1,8 @@
+TESTS += ply-frame-buffer-test
+
+ply_frame_buffer_test_CFLAGS = $(PLYMOUTH_CFLAGS) -DPLY_FRAME_BUFFER_ENABLE_TEST
+ply_frame_buffer_test_LDADD = $(PLYMOUTH_LIBS) -lm
+ply_frame_buffer_test_SOURCES = \
+                          $(srcdir)/../ply-utils.h                            \
+                          $(srcdir)/../ply-frame-buffer.h                     \
+                          $(srcdir)/../ply-frame-buffer.c

diff --git a/src/tests/ply-image-test.am b/src/tests/ply-image-test.am
new file mode 100644 (file)
index 0000000..3183a39
--- /dev/null
+++ b/src/tests/ply-image-test.am
@@ -0,0 +1,10 @@
+TESTS += ply-image-test
+
+ply_image_test_CFLAGS = $(PLYMOUTH_CFLAGS) -DPLY_IMAGE_ENABLE_TEST
+ply_image_test_LDADD = $(PLYMOUTH_LIBS) -lm -lpng
+ply_image_test_SOURCES =                                                      \
+                          $(srcdir)/../ply-utils.h                            \
+                          $(srcdir)/../ply-frame-buffer.h                     \
+                          $(srcdir)/../ply-frame-buffer.c                     \
+                          $(srcdir)/../ply-image.h                            \
+                          $(srcdir)/../ply-image.c 

diff --git a/src/tests/ply-init-control-test.am b/src/tests/ply-init-control-test.am
new file mode 100644 (file)
index 0000000..b53a2f5
--- /dev/null
+++ b/src/tests/ply-init-control-test.am
@@ -0,0 +1,11 @@
+TESTS += ply-init-control-test
+
+ply_init_control_test_CFLAGS = $(PLYMOUTH_CFLAGS) -DPLY_INIT_CONTROL_ENABLE_TEST
+ply_init_control_test_LDADD = $(PLYMOUTH_LIBS)
+ply_init_control_test_SOURCES =                                               \
+                          $(srcdir)/../ply-utils.h                            \
+                          $(srcdir)/../ply-utils.c                            \
+                          $(srcdir)/../ply-terminal.h                         \
+                          $(srcdir)/../ply-terminal.c                         \
+                          $(srcdir)/../ply-init-control.h                     \
+                          $(srcdir)/../ply-init-control.c

diff --git a/src/tests/ply-terminal-test.am b/src/tests/ply-terminal-test.am
new file mode 100644 (file)
index 0000000..66f3c41
--- /dev/null
+++ b/src/tests/ply-terminal-test.am
@@ -0,0 +1,10 @@
+TESTS += ply-terminal-test
+
+ply_terminal_test_CFLAGS = $(PLYMOUTH_CFLAGS) -DPLY_TERMINAL_ENABLE_TEST
+ply_terminal_test_LDADD = $(PLYMOUTH_LIBS)
+
+ply_terminal_test_SOURCES =                                                   \
+                          $(srcdir)/../ply-utils.h                            \
+                          $(srcdir)/../ply-utils.c                            \
+                          $(srcdir)/../ply-terminal.h                         \
+                          $(srcdir)/../ply-terminal.c