From 86e37ea8c5c758b6d22308104755a396816d8768 Mon Sep 17 00:00:00 2001
From: Andrea Corallo <akrl@sdf.org>
Date: Wed, 30 Sep 2020 15:19:18 +0200
Subject: [PATCH] * .gitlab-ci.yml: Uncomment some testing to align with
 master.

---
 .gitlab-ci.yml | 93 ++++++++++++++++++++++++--------------------------
 1 file changed, 45 insertions(+), 48 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 93929f211cd..e5ebd6a92a1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,58 +37,55 @@ before_script:
 stages:
   - test
 
-# FIXME: Commented for this branch till is known to be broken.
-# test-all:
-#   # This tests also file monitor libraries inotify and inotifywatch.
-#   stage: test
-#   only:
-#     changes:
-#       - "Makefile.in"
-#       - .gitlab-ci.yml
-#       - aclocal.m4
-#       - autogen.sh
-#       - configure.ac
-#       - lib/*.{h,c}
-#       - lisp/*.el
-#       - lisp/**/*.el
-#       - src/*.{h,c}
-#       - test/lisp/*.el
-#       - test/lisp/**/*.el
-#       - test/src/*.el
-#   except:
-#     changes:
-#       # gfilemonitor, kqueue
-#       - src/gfilenotify.c
-#       - src/kqueue.c
-#       # MS Windows
-#       - lisp/w32*.el
-#       - lisp/term/w32*.el
-#       - src/w32*.{h,c}
-#       # GNUstep
-#       - lisp/term/ns-win.el
-#       - src/ns*.{h,m}
-#       - src/macfont.{h,m}
-#   script:
-#     - DEBIAN_FRONTEND=noninteractive apt install --no-install-recommends -y -qq -o=Dpkg::Use-Pty=0 inotify-tools
-#     - ./autogen.sh autoconf
-#     - ./configure --without-makeinfo
-#     - make bootstrap
-#     - make check-expensive
+test-all:
+  # This tests also file monitor libraries inotify and inotifywatch.
+  stage: test
+  only:
+    changes:
+      - "Makefile.in"
+      - .gitlab-ci.yml
+      - aclocal.m4
+      - autogen.sh
+      - configure.ac
+      - lib/*.{h,c}
+      - lisp/*.el
+      - lisp/**/*.el
+      - src/*.{h,c}
+      - test/lisp/*.el
+      - test/lisp/**/*.el
+      - test/src/*.el
+  except:
+    changes:
+      # gfilemonitor, kqueue
+      - src/gfilenotify.c
+      - src/kqueue.c
+      # MS Windows
+      - lisp/w32*.el
+      - lisp/term/w32*.el
+      - src/w32*.{h,c}
+      # GNUstep
+      - lisp/term/ns-win.el
+      - src/ns*.{h,m}
+      - src/macfont.{h,m}
+  script:
+    - DEBIAN_FRONTEND=noninteractive apt install --no-install-recommends -y -qq -o=Dpkg::Use-Pty=0 inotify-tools
+    - ./autogen.sh autoconf
+    - ./configure --without-makeinfo
+    - make bootstrap
+    - make check-expensive
 
 test-filenotify-gio:
   stage: test
   # This tests file monitor libraries gfilemonitor and gio.
-
-  ## Commented to keep stock bootstrap tested.
-  # only:
-  #   changes:
-  #     - .gitlab-ci.yml
-  #     - lisp/autorevert.el
-  #     - lisp/filenotify.el
-  #     - lisp/net/tramp-sh.el
-  #     - src/gfilenotify.c
-  #     - test/lisp/autorevert-tests.el
-  #     - test/lisp/filenotify-tests.el
+  only:
+    changes:
+      - .gitlab-ci.yml
+      - lisp/autorevert.el
+      - lisp/filenotify.el
+      - lisp/net/tramp-sh.el
+      - src/gfilenotify.c
+      - test/lisp/autorevert-tests.el
+      - test/lisp/filenotify-tests.el
   script:
     - DEBIAN_FRONTEND=noninteractive apt install --no-install-recommends -y -qq -o=Dpkg::Use-Pty=0 libglib2.0-dev libglib2.0-bin libglib2.0-0
     - ./autogen.sh autoconf
-- 
2.39.5