valeriyvdovin / rpms / systemd

Forked from rpms/systemd 4 years ago
Clone

Blame SOURCES/0679-travis-temporarily-skip-test_path_changed.patch

Pablo Greco 48fc63
From 7c1d32eb199490e6b9af4fbe84652d5b2e822427 Mon Sep 17 00:00:00 2001
Pablo Greco 48fc63
From: Frantisek Sumsal <fsumsal@redhat.com>
Pablo Greco 48fc63
Date: Wed, 16 Jan 2019 09:49:14 +0100
Pablo Greco 48fc63
Subject: [PATCH] travis: temporarily skip test_path_changed
Pablo Greco 48fc63
Pablo Greco 48fc63
---
Pablo Greco 48fc63
 ci/travis-centos-rhel7.sh | 8 ++++++++
Pablo Greco 48fc63
 1 file changed, 8 insertions(+)
Pablo Greco 48fc63
Pablo Greco 48fc63
diff --git a/ci/travis-centos-rhel7.sh b/ci/travis-centos-rhel7.sh
Pablo Greco 48fc63
index b1b3de1cc2..870f4d8e33 100755
Pablo Greco 48fc63
--- a/ci/travis-centos-rhel7.sh
Pablo Greco 48fc63
+++ b/ci/travis-centos-rhel7.sh
Pablo Greco 48fc63
@@ -52,6 +52,14 @@ for phase in "${PHASES[@]}"; do
Pablo Greco 48fc63
                                      --enable-gtk-doc --enable-compat-libs --disable-sysusers \
Pablo Greco 48fc63
                                      --disable-ldconfig --enable-lz4 --with-sysvinit-path=/etc/rc.d/init.d
Pablo Greco 48fc63
             $DOCKER_EXEC make
Pablo Greco 48fc63
+            # Temporarily skip test_path_changed in src/test/test-path.c
Pablo Greco 48fc63
+            # This particular test case timeouts on Ubuntu in a Docker image
Pablo Greco 48fc63
+            # and needs further debugging (couldn't reproduce it on
Pablo Greco 48fc63
+            # Fedora + Docker
Pablo Greco 48fc63
+            $DOCKER_EXEC sed -i '/static void test_path_changed/,/^}\s*$/d' src/test/test-path.c
Pablo Greco 48fc63
+            $DOCKER_EXEC sed -i '/test_path_changed,/d' src/test/test-path.c
Pablo Greco 48fc63
+
Pablo Greco 48fc63
+            # Run the internal testsuite
Pablo Greco 48fc63
             if ! $DOCKER_EXEC make check; then
Pablo Greco 48fc63
                 $DOCKER_EXEC cat test-suite.log
Pablo Greco 48fc63
                 exit 1