[Spice-commits] 2 commits - server/tests

[Frediano Ziglio]

 server/tests/Makefile.am |   42 +++++++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 19 deletions(-)

New commits:
commit 328a4a9b2854f0c1d67c8b131f7bfd76173efdae
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Fri Sep 15 08:52:30 2017 +0100

    tests: Rename stat-main.c to test-stat.c
    
    All main test module have this test-XXXX.c naming, make
    test-stat coherent.
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Christophe Fergeau <cfergeau at redhat.com>

diff --git a/server/tests/Makefile.am b/server/tests/Makefile.am
index f57040e8..391dab06 100644
--- a/server/tests/Makefile.am
+++ b/server/tests/Makefile.am
@@ -101,7 +101,7 @@ noinst_LIBRARIES += \
 	libtest-stat4.a \
 	$(NULL)
 
-test_stat_SOURCES = stat-main.c
+test_stat_SOURCES = test-stat.c
 test_stat_LDADD = \
 	libtest-stat1.a \
 	libtest-stat2.a \
diff --git a/server/tests/stat-main.c b/server/tests/test-stat.c
similarity index 100%
rename from server/tests/stat-main.c
rename to server/tests/test-stat.c
commit c64fe795c96b1671097980459bdb82b9260f2951
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Fri Sep 15 08:45:31 2017 +0100

    tests: Separate Makefile.am in sections
    
    Put non-trivial programs in separate sections, which makes it easier to
    understand the relationship between macros.
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Christophe Fergeau <cfergeau at redhat.com>

diff --git a/server/tests/Makefile.am b/server/tests/Makefile.am
index 2efc136d..f57040e8 100644
--- a/server/tests/Makefile.am
+++ b/server/tests/Makefile.am
@@ -67,30 +67,17 @@ noinst_PROGRAMS =				\
 	test-display-resolution-changes		\
 	test-two-servers			\
 	test-display-width-stride		\
-	spice-server-replay			\
 	$(check_PROGRAMS)			\
 	$(NULL)
 
-if HAVE_GSTREAMER
-noinst_PROGRAMS += test-gst
-endif
-
 TESTS = $(check_PROGRAMS)			\
 	$(NULL)
 
-if ENABLE_EXTRA_CHECKS
-if HAVE_GSTREAMER_1_0
-TESTS += video-encoders
-endif
-endif
-EXTRA_DIST += video-encoders
+test_qxl_parsing_LDADD = ../libserver.la $(LDADD)
 
-noinst_LIBRARIES += \
-	libtest-stat1.a \
-	libtest-stat2.a \
-	libtest-stat3.a \
-	libtest-stat4.a \
-	$(NULL)
+## spice-server-replay
+
+noinst_PROGRAMS += spice-server-replay
 
 spice_server_replay_SOURCES = replay.c		\
 	../event-loop.c				\
@@ -105,6 +92,15 @@ spice_server_replay_LDADD =					\
 	$(SPICE_NONPKGCONFIG_LIBS)		                \
 	$(NULL)
 
+## test-stat
+
+noinst_LIBRARIES += \
+	libtest-stat1.a \
+	libtest-stat2.a \
+	libtest-stat3.a \
+	libtest-stat4.a \
+	$(NULL)
+
 test_stat_SOURCES = stat-main.c
 test_stat_LDADD = \
 	libtest-stat1.a \
@@ -126,9 +122,15 @@ libtest_stat3_a_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_COMPRESS_STAT=1 -DTEST_RED_WORK
 libtest_stat4_a_SOURCES = stat-test.c
 libtest_stat4_a_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_COMPRESS_STAT=1 -DTEST_RED_WORKER_STAT=1 -DTEST_NAME=stat_test4
 
-test_qxl_parsing_LDADD = ../libserver.la $(LDADD)
+## test-gst (helper) and video-encoders (test)
 
 if HAVE_GSTREAMER
+noinst_PROGRAMS += test-gst
+
+if ENABLE_EXTRA_CHECKS
+TESTS += video-encoders
+endif
+
 test_gst_SOURCES = test-gst.c \
 	$(NULL)
 test_gst_CPPFLAGS = \
@@ -137,3 +139,5 @@ test_gst_CPPFLAGS = \
 	$(GSTREAMER_1_0_CFLAGS)			\
 	$(NULL)
 endif
+
+EXTRA_DIST += video-encoders