[Spice-commits] 2 commits - .gitlab-ci.yml server/tests

[GitLab Mirror]

 .gitlab-ci.yml           |    2 +-
 server/tests/Makefile.am |    6 +++---
 server/tests/meson.build |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit ec5f9b008fa89df6c044f0e226dad6be95e6b3ac
Author: Uri Lublin <uril at redhat.com>
Date:   Mon Jul 22 13:13:55 2019 +0300

    tests: rename video-encoders to test-video-encoders
    
    Acked-by: Frediano Ziglio <fziglio at redhat.com>

diff --git a/server/tests/Makefile.am b/server/tests/Makefile.am
index ccaf5c87..1e62557a 100644
--- a/server/tests/Makefile.am
+++ b/server/tests/Makefile.am
@@ -139,13 +139,13 @@ 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-gst (helper) and video-encoders (test)
+## test-gst (helper) and test-video-encoders (test)
 
 if HAVE_GSTREAMER
 noinst_PROGRAMS += test-gst
 
 if ENABLE_EXTRA_CHECKS
-TESTS += video-encoders
+TESTS += test-video-encoders
 endif
 
 test_gst_SOURCES = test-gst.c \
@@ -157,7 +157,7 @@ test_gst_CPPFLAGS = \
 	$(NULL)
 endif
 
-EXTRA_DIST += video-encoders
+EXTRA_DIST += test-video-encoders
 
 if HAVE_SASL
 check_PROGRAMS += test-sasl
diff --git a/server/tests/meson.build b/server/tests/meson.build
index b6cf8989..c9377f1e 100644
--- a/server/tests/meson.build
+++ b/server/tests/meson.build
@@ -74,7 +74,7 @@ endif
 if spice_server_has_gstreamer
   tests += [['test-gst', false]]
   if get_option('extra-checks')
-    test('video-encoders', files('video-encoders'))
+    test('test-video-encoders', files('test-video-encoders'))
   endif
 endif
 
diff --git a/server/tests/video-encoders b/server/tests/test-video-encoders
similarity index 100%
rename from server/tests/video-encoders
rename to server/tests/test-video-encoders
commit e40a57027f1dbe06e37ec88354ce4191c3d3f557
Author: Uri Lublin <uril at redhat.com>
Date:   Mon Jul 22 13:13:54 2019 +0300

    ci: pre-install "file"
    
    This fixes the following warning:
      ./configure: line 7040: /usr/bin/file: No such file or directory
    
    Signed-off-by: Uri Lublin <uril at redhat.com>
    Acked-by: Frediano Ziglio <fziglio at redhat.com>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 316a860d..33210cb9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@ before_script:
   - >
     dnf install 'dnf-command(debuginfo-install)' git libtool make libasan orc-devel
     python3 python3-six python3-pyparsing glib-networking
-    asciidoc bzip2 meson ninja-build
+    asciidoc bzip2 meson ninja-build file
     glib2-devel celt051-devel pixman-devel alsa-lib-devel openssl-devel libjpeg-turbo-devel
     libcacard-devel cyrus-sasl-devel lz4-devel opus-devel
     gstreamer1-devel gstreamer1-plugins-base-devel