richardphibel / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
Pablo Greco 48fc63
From 3c66bfddf2038b3d999045dffd1b3beefbb1f8f4 Mon Sep 17 00:00:00 2001
Pablo Greco 48fc63
From: Frantisek Sumsal <fsumsal@redhat.com>
Pablo Greco 48fc63
Date: Thu, 17 Jan 2019 13:21:42 +0100
Pablo Greco 48fc63
Subject: [PATCH] travis: drop the test_path_changed workaround
Pablo Greco 48fc63
Pablo Greco 48fc63
---
Pablo Greco 48fc63
 ci/travis-centos-rhel7.sh | 7 -------
Pablo Greco 48fc63
 1 file changed, 7 deletions(-)
Pablo Greco 48fc63
Pablo Greco 48fc63
diff --git a/ci/travis-centos-rhel7.sh b/ci/travis-centos-rhel7.sh
Pablo Greco 48fc63
index 9f128ab8e2..7db3a8db41 100755
Pablo Greco 48fc63
--- a/ci/travis-centos-rhel7.sh
Pablo Greco 48fc63
+++ b/ci/travis-centos-rhel7.sh
Pablo Greco 48fc63
@@ -52,13 +52,6 @@ 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
             # Let's install the new systemd and "reboot" the container to avoid
Pablo Greco 48fc63
             # unexpected fails due to incompatibilities with older systemd