From: Andrea Corallo <akrl@sdf.org>
Date: Sun, 6 Sep 2020 06:07:30 +0000 (+0200)
Subject: Merge remote-tracking branch 'savannah/master' into HEAD
X-Git-Tag: emacs-28.0.90~2727^2~462
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=805563346613af1f13ecd1bf96ffd8efe4816b47;p=emacs.git

Merge remote-tracking branch 'savannah/master' into HEAD
---

805563346613af1f13ecd1bf96ffd8efe4816b47
diff --cc .gitlab-ci.yml
index 099b947dff1,f4e08d59dd0..6627f5f8054
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -37,16 -37,42 +37,43 @@@ before_script
  stages:
    - test
  
 -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
 +# 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-filenotify-gio:
    stage: test