[daemon] Update tests to include compile correctly

Adds ply-list.c/h to all tests automake files which use ply-logger.c.
Adds PLYMOUTH_TIME_DIRECTORY/PLUGIN/THEME_PATH when ply-boot-splash.c is used.
Adds PLY_BOOT_SPLASH_MODE_BOOT_UP to the ply_boot_splash_show call.
This commit is contained in:
Charlie Brej 2009-05-13 10:31:44 +01:00 committed by Ray Strode
parent 1f7e2c0772
commit d45a6e4915
6 changed files with 14 additions and 2 deletions

View file

@ -6,6 +6,8 @@ ply_array_test_LDADD = $(PLYMOUTH_LIBS)
ply_array_test_SOURCES = \
$(srcdir)/../ply-buffer.h \
$(srcdir)/../ply-buffer.c \
$(srcdir)/../ply-list.h \
$(srcdir)/../ply-list.c \
$(srcdir)/../ply-logger.h \
$(srcdir)/../ply-logger.c \
$(srcdir)/../ply-utils.h \

View file

@ -6,6 +6,8 @@ ply_frame_buffer_test_SOURCES = \
$(srcdir)/../ply-utils.h \
$(srcdir)/../ply-frame-buffer.h \
$(srcdir)/../ply-frame-buffer.c \
$(srcdir)/../ply-list.h \
$(srcdir)/../ply-list.c \
$(srcdir)/../ply-logger.h \
$(srcdir)/../ply-logger.c \
$(srcdir)/../ply-utils.h \

View file

@ -4,6 +4,8 @@ ply_logger_test_CFLAGS = $(PLYMOUTH_CFLAGS) -DPLY_LOGGER_ENABLE_TEST
ply_logger_test_LDADD = $(PLYMOUTH_LIBS)
ply_logger_test_SOURCES = \
$(srcdir)/../ply-list.h \
$(srcdir)/../ply-list.c \
$(srcdir)/../ply-utils.h \
$(srcdir)/../ply-utils.c \
$(srcdir)/../ply-logger.h \

View file

@ -4,6 +4,8 @@ ply_terminal_test_CFLAGS = $(PLYMOUTH_CFLAGS) -DPLY_TERMINAL_ENABLE_TEST
ply_terminal_test_LDADD = $(PLYMOUTH_LIBS)
ply_terminal_test_SOURCES = \
$(srcdir)/../ply-list.h \
$(srcdir)/../ply-list.c \
$(srcdir)/../ply-logger.h \
$(srcdir)/../ply-logger.c \
$(srcdir)/../ply-utils.h \

View file

@ -478,7 +478,7 @@ main (int argc,
ply_boot_splash_add_window (state.splash, state.window);
ply_boot_splash_attach_to_event_loop (state.splash, state.loop);
if (!ply_boot_splash_show (state.splash))
if (!ply_boot_splash_show (state.splash, PLY_BOOT_SPLASH_MODE_BOOT_UP))
{
perror ("could not show splash screen");
return errno;

View file

@ -1,6 +1,10 @@
TESTS += ply-boot-splash-test
ply_boot_splash_test_CFLAGS = $(PLYMOUTH_CFLAGS) -DPLY_BOOT_SPLASH_ENABLE_TEST -DPLYMOUTH_TIME_DIRECTORY=\"/var/lib/plymouth\"
ply_boot_splash_test_CFLAGS = $(PLYMOUTH_CFLAGS) -DPLY_BOOT_SPLASH_ENABLE_TEST \
-DPLYMOUTH_TIME_DIRECTORY=\"/var/lib/plymouth\" \
-DPLYMOUTH_PLUGIN_PATH=\"$(libdir)/plymouth/\" \
-DPLYMOUTH_THEME_PATH=\"$(PLYMOUTH_THEME_PATH)/\"
ply_boot_splash_test_LDADD = $(PLYMOUTH_LIBS) ../libply/libply.la
ply_boot_splash_test_SOURCES = \