From d45a6e4915d1bbff14656419624b1ffbc5b3b706 Mon Sep 17 00:00:00 2001 From: Charlie Brej Date: Wed, 13 May 2009 10:31:44 +0100 Subject: [PATCH] [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. --- src/libply/tests/ply-array-test.am | 2 ++ src/libply/tests/ply-frame-buffer-test.am | 2 ++ src/libply/tests/ply-logger-test.am | 2 ++ src/libply/tests/ply-terminal-test.am | 2 ++ src/ply-boot-splash.c | 2 +- src/tests/ply-boot-splash-test.am | 6 +++++- 6 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/libply/tests/ply-array-test.am b/src/libply/tests/ply-array-test.am index 5888a305..4f8ecc4e 100644 --- a/src/libply/tests/ply-array-test.am +++ b/src/libply/tests/ply-array-test.am @@ -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 \ diff --git a/src/libply/tests/ply-frame-buffer-test.am b/src/libply/tests/ply-frame-buffer-test.am index a402201c..82afe7fd 100644 --- a/src/libply/tests/ply-frame-buffer-test.am +++ b/src/libply/tests/ply-frame-buffer-test.am @@ -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 \ diff --git a/src/libply/tests/ply-logger-test.am b/src/libply/tests/ply-logger-test.am index 74330561..a589fb92 100644 --- a/src/libply/tests/ply-logger-test.am +++ b/src/libply/tests/ply-logger-test.am @@ -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 \ diff --git a/src/libply/tests/ply-terminal-test.am b/src/libply/tests/ply-terminal-test.am index 92624135..67a25724 100644 --- a/src/libply/tests/ply-terminal-test.am +++ b/src/libply/tests/ply-terminal-test.am @@ -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 \ diff --git a/src/ply-boot-splash.c b/src/ply-boot-splash.c index 9ef100a7..e9533675 100644 --- a/src/ply-boot-splash.c +++ b/src/ply-boot-splash.c @@ -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; diff --git a/src/tests/ply-boot-splash-test.am b/src/tests/ply-boot-splash-test.am index 2444c32c..7e14d75c 100644 --- a/src/tests/ply-boot-splash-test.am +++ b/src/tests/ply-boot-splash-test.am @@ -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 = \