fix/bug-48598 updated (45a96890d2 -> 2c50987050)

[F. Jason Park]

jpneverwas pushed a change to branch fix/bug-48598.

      from  45a96890d2 [DEBUG] Quote dollar sign differently in CI job
       new  26d569c9f5 [DEBUG] Revert all test/infra tinkering
       new  6716cb34f2 Special-case ERC when generating CI test jobs
       new  2c50987050 [CATCH-UP] Synchronize with patch set on tracker


Summary of changes:
 etc/ERC-NEWS                                       | 50 ++++++++++++----------
 lisp/erc/erc-backend.el                            |  3 +-
 lisp/erc/erc.el                                    |  3 +-
 test/infra/Makefile.in                             | 13 ++++--
 test/infra/gitlab-ci.yml                           |  1 -
 test/infra/test-jobs.yml                           |  4 +-
 .../erc-scenarios-auth-source.el                   |  0
 .../erc-scenarios-base-association-nick.el         |  9 ++--
 .../erc-scenarios-base-association-samenet.el      |  4 +-
 .../erc-scenarios-base-association.el              | 12 ++----
 .../erc-scenarios-base-compat-rename-bouncer.el    | 14 +++---
 .../erc-scenarios-base-misc-regressions.el         |  8 +---
 .../erc-scenarios-base-netid-bouncer-id.el         |  0
 .../erc-scenarios-base-netid-bouncer-recon-base.el |  0
 .../erc-scenarios-base-netid-bouncer-recon-both.el |  0
 .../erc-scenarios-base-netid-bouncer-recon-id.el   |  0
 .../erc-scenarios-base-netid-bouncer.el            |  0
 .../erc-scenarios-base-netid-samenet.el            |  2 +-
 .../erc-scenarios-base-reconnect.el                |  5 +--
 .../erc-scenarios-base-renick.el                   |  5 ---
 .../erc-scenarios-base-reuse-buffers.el            | 18 +++-----
 .../erc-scenarios-base-unstable.el                 |  5 +--
 .../erc-scenarios-base-upstream-recon-soju.el      |  1 +
 .../erc-scenarios-base-upstream-recon-znc.el       |  1 +
 .../{erc-scenarios => }/erc-scenarios-internal.el  |  0
 .../erc-scenarios-join-auth-source.el              |  0
 .../erc-scenarios-join-netid-newcmd-id.el          |  0
 .../erc-scenarios-join-netid-newcmd.el             |  0
 .../erc-scenarios-join-netid-recon-id.el           |  0
 .../erc-scenarios-join-netid-recon.el              |  0
 .../erc/{erc-scenarios => }/erc-scenarios-misc.el  |  6 +--
 .../erc-scenarios-services-misc.el                 |  0
 .../base/assoc}/bouncer-history/barnet.eld         |  0
 .../base/assoc}/bouncer-history/foonet.eld         |  0
 .../base/assoc/bumped/again.eld}                   |  0
 .../base/assoc/bumped/foisted.eld}                 |  0
 .../base/assoc/bumped/refoisted.eld}               |  0
 .../base/assoc/bumped}/renicked.eld                |  0
 .../base/assoc}/multi-net/barnet.eld               |  0
 .../base/assoc}/multi-net/foonet.eld               |  0
 .../base/assoc/reconplay/again.eld}                |  0
 .../base/assoc/reconplay}/foonet.eld               |  0
 .../base/assoc/samenet}/chester.eld                |  0
 .../base/assoc/samenet}/tester.eld                 |  0
 .../base/assoc/samenet/tester2.eld}                |  0
 .../resources/base/auth-source/foonet.eld          |  0
 .../resources/base/auth-source/nopass.eld          |  0
 .../base/channel-buffer-revival/foonet.eld         |  0
 .../resources/base/flood/soju.eld                  |  0
 .../resources/base/gapless-connect/barnet.eld      |  0
 .../resources/base/gapless-connect/foonet.eld      |  0
 .../resources/base/gapless-connect/pass-stub.eld   |  0
 .../resources/base/mask-target-routing/foonet.eld  |  0
 .../base/netid}/bouncer/barnet-again.eld           |  2 +-
 .../base/netid}/bouncer/barnet-drop.eld            |  0
 .../base/netid}/bouncer/barnet.eld                 |  0
 .../base/netid}/bouncer/foonet-again.eld           |  2 +-
 .../base/netid}/bouncer/foonet-drop.eld            |  0
 .../base/netid}/bouncer/foonet.eld                 |  0
 .../base/netid}/bouncer/stub-again.eld             |  0
 .../base/netid/samenet}/chester.eld                |  0
 .../base/netid/samenet}/tester.eld                 |  0
 .../resources/base/reconnect/aborted-dupe.eld      |  0
 .../resources/base/reconnect/aborted.eld           |  0
 .../resources/base/reconnect/options-again.eld     |  0
 .../resources/base/reconnect/options.eld           |  0
 .../resources/base/reconnect/timer-last.eld        |  1 +
 .../resources/base/reconnect/timer.eld             |  0
 .../base/renick/queries/bouncer-barnet.eld         |  0
 .../base/renick/queries/bouncer-foonet.eld         |  0
 .../resources/base/renick/queries/solo.eld         |  0
 .../resources/base/renick/self/auto.eld            |  0
 .../resources/base/renick/self/manual.eld          |  0
 .../resources/base/renick/self/qual-chester.eld    |  0
 .../resources/base/renick/self/qual-tester.eld     |  0
 .../base/reuse-buffers/channel}/barnet.eld         |  0
 .../base/reuse-buffers/channel}/foonet.eld         |  0
 .../base/reuse-buffers/server}/barnet.eld          |  0
 .../base/reuse-buffers/server}/foonet.eld          |  0
 .../base/upstream-reconnect/soju-barnet.eld        |  0
 .../base/upstream-reconnect/soju-foonet.eld        |  0
 .../base/upstream-reconnect/znc-barnet.eld         |  0
 .../base/upstream-reconnect/znc-foonet.eld         |  0
 .../{erc-scenarios => }/resources/erc-d/erc-d-i.el |  0
 .../{erc-scenarios => }/resources/erc-d/erc-d-t.el |  0
 .../resources/erc-d/erc-d-tests.el                 | 25 +++++++++++
 .../{erc-scenarios => }/resources/erc-d/erc-d-u.el |  0
 .../{erc-scenarios => }/resources/erc-d/erc-d.el   |  0
 .../resources/erc-d/resources/basic.eld            |  0
 .../resources/erc-d/resources/depleted.eld         |  0
 .../resources/erc-d/resources/drop-a.eld           |  0
 .../resources/erc-d/resources/drop-b.eld           |  0
 .../resources/erc-d/resources/dynamic-barnet.eld   |  0
 .../resources/erc-d/resources/dynamic-foonet.eld   |  0
 .../resources/erc-d/resources/dynamic-stub.eld     |  0
 .../resources/erc-d/resources/dynamic.eld          |  0
 .../resources/erc-d/resources/eof.eld              |  0
 .../resources/erc-d/resources/fuzzy.eld            |  0
 .../resources/erc-d/resources/incremental.eld      |  0
 .../resources/erc-d/resources/irc-parser-tests.eld |  0
 .../resources/erc-d/resources/linger-multi-a.eld   |  0
 .../resources/erc-d/resources/linger-multi-b.eld   |  0
 .../resources/erc-d/resources/linger.eld           |  0
 .../resources/erc-d/resources/no-block.eld         |  0
 .../resources/erc-d/resources/no-match.eld         |  0
 .../resources/erc-d/resources/no-pong.eld          |  0
 .../resources/erc-d/resources/nonstandard.eld      |  0
 .../resources/erc-d/resources/proxy-barnet.eld     |  0
 .../resources/erc-d/resources/proxy-foonet.eld     |  0
 .../resources/erc-d/resources/proxy-solo.eld       |  0
 .../resources/erc-d/resources/proxy-subprocess.el  |  0
 .../resources/erc-d/resources/timeout.eld          |  0
 .../resources/erc-d/resources/unexpected.eld       |  0
 .../resources/erc-scenarios-common.el              | 30 +++++--------
 .../resources/join/auth-source/foonet.eld          |  0
 .../resources/join/legacy/foonet.eld               |  0
 .../resources/join/network-id/barnet.eld           |  0
 .../resources/join/network-id/foonet-again.eld     |  0
 .../resources/join/network-id/foonet.eld           |  0
 .../resources/join/reconnect/foonet-again.eld      |  0
 .../resources/join/reconnect/foonet.eld            |  0
 .../networks/announced-missing/foonet.eld          |  0
 .../resources/services/auth-source/libera.eld      |  0
 .../resources/services/password/libera.eld         |  0
 124 files changed, 112 insertions(+), 112 deletions(-)
 rename test/lisp/erc/{erc-scenarios => }/erc-scenarios-auth-source.el (100%)
 rename test/lisp/erc/{erc-scenarios => 
}/erc-scenarios-base-association-nick.el (95%)
 rename test/lisp/erc/{erc-scenarios => 
}/erc-scenarios-base-association-samenet.el (98%)
 rename test/lisp/erc/{erc-scenarios => }/erc-scenarios-base-association.el 
(94%)
 rename test/lisp/erc/{erc-scenarios => 
}/erc-scenarios-base-compat-rename-bouncer.el (93%)
 rename test/lisp/erc/{erc-scenarios => 
}/erc-scenarios-base-misc-regressions.el (95%)
 rename test/lisp/erc/{erc-scenarios => 
}/erc-scenarios-base-netid-bouncer-id.el (100%)
 rename test/lisp/erc/{erc-scenarios => 
}/erc-scenarios-base-netid-bouncer-recon-base.el (100%)
 rename test/lisp/erc/{erc-scenarios => 
}/erc-scenarios-base-netid-bouncer-recon-both.el (100%)
 rename test/lisp/erc/{erc-scenarios => 
}/erc-scenarios-base-netid-bouncer-recon-id.el (100%)
 rename test/lisp/erc/{erc-scenarios => }/erc-scenarios-base-netid-bouncer.el 
(100%)
 rename test/lisp/erc/{erc-scenarios => }/erc-scenarios-base-netid-samenet.el 
(98%)
 rename test/lisp/erc/{erc-scenarios => }/erc-scenarios-base-reconnect.el (98%)
 rename test/lisp/erc/{erc-scenarios => }/erc-scenarios-base-renick.el (98%)
 rename test/lisp/erc/{erc-scenarios => }/erc-scenarios-base-reuse-buffers.el 
(95%)
 rename test/lisp/erc/{erc-scenarios => }/erc-scenarios-base-unstable.el (96%)
 rename test/lisp/erc/{erc-scenarios => 
}/erc-scenarios-base-upstream-recon-soju.el (98%)
 rename test/lisp/erc/{erc-scenarios => 
}/erc-scenarios-base-upstream-recon-znc.el (98%)
 rename test/lisp/erc/{erc-scenarios => }/erc-scenarios-internal.el (100%)
 rename test/lisp/erc/{erc-scenarios => }/erc-scenarios-join-auth-source.el 
(100%)
 rename test/lisp/erc/{erc-scenarios => }/erc-scenarios-join-netid-newcmd-id.el 
(100%)
 rename test/lisp/erc/{erc-scenarios => }/erc-scenarios-join-netid-newcmd.el 
(100%)
 rename test/lisp/erc/{erc-scenarios => }/erc-scenarios-join-netid-recon-id.el 
(100%)
 rename test/lisp/erc/{erc-scenarios => }/erc-scenarios-join-netid-recon.el 
(100%)
 rename test/lisp/erc/{erc-scenarios => }/erc-scenarios-misc.el (96%)
 rename test/lisp/erc/{erc-scenarios => }/erc-scenarios-services-misc.el (100%)
 rename test/lisp/erc/{erc-scenarios/resources/base/association => 
resources/base/assoc}/bouncer-history/barnet.eld (100%)
 rename test/lisp/erc/{erc-scenarios/resources/base/association => 
resources/base/assoc}/bouncer-history/foonet.eld (100%)
 rename 
test/lisp/erc/{erc-scenarios/resources/base/association/nick-bump/renicked-again.eld
 => resources/base/assoc/bumped/again.eld} (100%)
 rename 
test/lisp/erc/{erc-scenarios/resources/base/association/nick-bump/renicked-foisted.eld
 => resources/base/assoc/bumped/foisted.eld} (100%)
 rename 
test/lisp/erc/{erc-scenarios/resources/base/association/nick-bump/renicked-foisted-again.eld
 => resources/base/assoc/bumped/refoisted.eld} (100%)
 rename test/lisp/erc/{erc-scenarios/resources/base/association/nick-bump => 
resources/base/assoc/bumped}/renicked.eld (100%)
 rename test/lisp/erc/{erc-scenarios/resources/base/association => 
resources/base/assoc}/multi-net/barnet.eld (100%)
 rename test/lisp/erc/{erc-scenarios/resources/base/association => 
resources/base/assoc}/multi-net/foonet.eld (100%)
 rename 
test/lisp/erc/{erc-scenarios/resources/base/association/reconnect-playback/foonet-again.eld
 => resources/base/assoc/reconplay/again.eld} (100%)
 rename 
test/lisp/erc/{erc-scenarios/resources/base/association/reconnect-playback => 
resources/base/assoc/reconplay}/foonet.eld (100%)
 rename test/lisp/erc/{erc-scenarios/resources/base/association/same-network => 
resources/base/assoc/samenet}/chester.eld (100%)
 rename test/lisp/erc/{erc-scenarios/resources/base/association/same-network => 
resources/base/assoc/samenet}/tester.eld (100%)
 rename 
test/lisp/erc/{erc-scenarios/resources/base/association/same-network/tester-again.eld
 => resources/base/assoc/samenet/tester2.eld} (100%)
 rename test/lisp/erc/{erc-scenarios => }/resources/base/auth-source/foonet.eld 
(100%)
 rename test/lisp/erc/{erc-scenarios => }/resources/base/auth-source/nopass.eld 
(100%)
 rename test/lisp/erc/{erc-scenarios => 
}/resources/base/channel-buffer-revival/foonet.eld (100%)
 rename test/lisp/erc/{erc-scenarios => }/resources/base/flood/soju.eld (100%)
 rename test/lisp/erc/{erc-scenarios => 
}/resources/base/gapless-connect/barnet.eld (100%)
 rename test/lisp/erc/{erc-scenarios => 
}/resources/base/gapless-connect/foonet.eld (100%)
 rename test/lisp/erc/{erc-scenarios => 
}/resources/base/gapless-connect/pass-stub.eld (100%)
 rename test/lisp/erc/{erc-scenarios => 
}/resources/base/mask-target-routing/foonet.eld (100%)
 rename test/lisp/erc/{erc-scenarios/resources/base/network-id => 
resources/base/netid}/bouncer/barnet-again.eld (99%)
 rename test/lisp/erc/{erc-scenarios/resources/base/network-id => 
resources/base/netid}/bouncer/barnet-drop.eld (100%)
 rename test/lisp/erc/{erc-scenarios/resources/base/network-id => 
resources/base/netid}/bouncer/barnet.eld (100%)
 rename test/lisp/erc/{erc-scenarios/resources/base/network-id => 
resources/base/netid}/bouncer/foonet-again.eld (99%)
 rename test/lisp/erc/{erc-scenarios/resources/base/network-id => 
resources/base/netid}/bouncer/foonet-drop.eld (100%)
 rename test/lisp/erc/{erc-scenarios/resources/base/network-id => 
resources/base/netid}/bouncer/foonet.eld (100%)
 rename test/lisp/erc/{erc-scenarios/resources/base/network-id => 
resources/base/netid}/bouncer/stub-again.eld (100%)
 rename test/lisp/erc/{erc-scenarios/resources/base/network-id/same-network => 
resources/base/netid/samenet}/chester.eld (100%)
 rename test/lisp/erc/{erc-scenarios/resources/base/network-id/same-network => 
resources/base/netid/samenet}/tester.eld (100%)
 rename test/lisp/erc/{erc-scenarios => 
}/resources/base/reconnect/aborted-dupe.eld (100%)
 rename test/lisp/erc/{erc-scenarios => }/resources/base/reconnect/aborted.eld 
(100%)
 rename test/lisp/erc/{erc-scenarios => 
}/resources/base/reconnect/options-again.eld (100%)
 rename test/lisp/erc/{erc-scenarios => }/resources/base/reconnect/options.eld 
(100%)
 rename test/lisp/erc/{erc-scenarios => 
}/resources/base/reconnect/timer-last.eld (89%)
 rename test/lisp/erc/{erc-scenarios => }/resources/base/reconnect/timer.eld 
(100%)
 rename test/lisp/erc/{erc-scenarios => 
}/resources/base/renick/queries/bouncer-barnet.eld (100%)
 rename test/lisp/erc/{erc-scenarios => 
}/resources/base/renick/queries/bouncer-foonet.eld (100%)
 rename test/lisp/erc/{erc-scenarios => 
}/resources/base/renick/queries/solo.eld (100%)
 rename test/lisp/erc/{erc-scenarios => }/resources/base/renick/self/auto.eld 
(100%)
 rename test/lisp/erc/{erc-scenarios => }/resources/base/renick/self/manual.eld 
(100%)
 rename test/lisp/erc/{erc-scenarios => 
}/resources/base/renick/self/qual-chester.eld (100%)
 rename test/lisp/erc/{erc-scenarios => 
}/resources/base/renick/self/qual-tester.eld (100%)
 rename 
test/lisp/erc/{erc-scenarios/resources/base/reuse-buffers/channel-buffers => 
resources/base/reuse-buffers/channel}/barnet.eld (100%)
 rename 
test/lisp/erc/{erc-scenarios/resources/base/reuse-buffers/channel-buffers => 
resources/base/reuse-buffers/channel}/foonet.eld (100%)
 rename 
test/lisp/erc/{erc-scenarios/resources/base/reuse-buffers/server-buffers => 
resources/base/reuse-buffers/server}/barnet.eld (100%)
 rename 
test/lisp/erc/{erc-scenarios/resources/base/reuse-buffers/server-buffers => 
resources/base/reuse-buffers/server}/foonet.eld (100%)
 rename test/lisp/erc/{erc-scenarios => 
}/resources/base/upstream-reconnect/soju-barnet.eld (100%)
 rename test/lisp/erc/{erc-scenarios => 
}/resources/base/upstream-reconnect/soju-foonet.eld (100%)
 rename test/lisp/erc/{erc-scenarios => 
}/resources/base/upstream-reconnect/znc-barnet.eld (100%)
 rename test/lisp/erc/{erc-scenarios => 
}/resources/base/upstream-reconnect/znc-foonet.eld (100%)
 rename test/lisp/erc/{erc-scenarios => }/resources/erc-d/erc-d-i.el (100%)
 rename test/lisp/erc/{erc-scenarios => }/resources/erc-d/erc-d-t.el (100%)
 rename test/lisp/erc/{erc-scenarios => }/resources/erc-d/erc-d-tests.el (98%)
 rename test/lisp/erc/{erc-scenarios => }/resources/erc-d/erc-d-u.el (100%)
 rename test/lisp/erc/{erc-scenarios => }/resources/erc-d/erc-d.el (100%)
 rename test/lisp/erc/{erc-scenarios => }/resources/erc-d/resources/basic.eld 
(100%)
 rename test/lisp/erc/{erc-scenarios => 
}/resources/erc-d/resources/depleted.eld (100%)
 rename test/lisp/erc/{erc-scenarios => }/resources/erc-d/resources/drop-a.eld 
(100%)
 rename test/lisp/erc/{erc-scenarios => }/resources/erc-d/resources/drop-b.eld 
(100%)
 rename test/lisp/erc/{erc-scenarios => 
}/resources/erc-d/resources/dynamic-barnet.eld (100%)
 rename test/lisp/erc/{erc-scenarios => 
}/resources/erc-d/resources/dynamic-foonet.eld (100%)
 rename test/lisp/erc/{erc-scenarios => 
}/resources/erc-d/resources/dynamic-stub.eld (100%)
 rename test/lisp/erc/{erc-scenarios => }/resources/erc-d/resources/dynamic.eld 
(100%)
 rename test/lisp/erc/{erc-scenarios => }/resources/erc-d/resources/eof.eld 
(100%)
 rename test/lisp/erc/{erc-scenarios => }/resources/erc-d/resources/fuzzy.eld 
(100%)
 rename test/lisp/erc/{erc-scenarios => 
}/resources/erc-d/resources/incremental.eld (100%)
 rename test/lisp/erc/{erc-scenarios => 
}/resources/erc-d/resources/irc-parser-tests.eld (100%)
 rename test/lisp/erc/{erc-scenarios => 
}/resources/erc-d/resources/linger-multi-a.eld (100%)
 rename test/lisp/erc/{erc-scenarios => 
}/resources/erc-d/resources/linger-multi-b.eld (100%)
 rename test/lisp/erc/{erc-scenarios => }/resources/erc-d/resources/linger.eld 
(100%)
 rename test/lisp/erc/{erc-scenarios => 
}/resources/erc-d/resources/no-block.eld (100%)
 rename test/lisp/erc/{erc-scenarios => 
}/resources/erc-d/resources/no-match.eld (100%)
 rename test/lisp/erc/{erc-scenarios => }/resources/erc-d/resources/no-pong.eld 
(100%)
 rename test/lisp/erc/{erc-scenarios => 
}/resources/erc-d/resources/nonstandard.eld (100%)
 rename test/lisp/erc/{erc-scenarios => 
}/resources/erc-d/resources/proxy-barnet.eld (100%)
 rename test/lisp/erc/{erc-scenarios => 
}/resources/erc-d/resources/proxy-foonet.eld (100%)
 rename test/lisp/erc/{erc-scenarios => 
}/resources/erc-d/resources/proxy-solo.eld (100%)
 rename test/lisp/erc/{erc-scenarios => 
}/resources/erc-d/resources/proxy-subprocess.el (100%)
 rename test/lisp/erc/{erc-scenarios => }/resources/erc-d/resources/timeout.eld 
(100%)
 rename test/lisp/erc/{erc-scenarios => 
}/resources/erc-d/resources/unexpected.eld (100%)
 rename test/lisp/erc/{erc-scenarios => }/resources/erc-scenarios-common.el 
(95%)
 rename test/lisp/erc/{erc-scenarios => }/resources/join/auth-source/foonet.eld 
(100%)
 rename test/lisp/erc/{erc-scenarios => }/resources/join/legacy/foonet.eld 
(100%)
 rename test/lisp/erc/{erc-scenarios => }/resources/join/network-id/barnet.eld 
(100%)
 rename test/lisp/erc/{erc-scenarios => 
}/resources/join/network-id/foonet-again.eld (100%)
 rename test/lisp/erc/{erc-scenarios => }/resources/join/network-id/foonet.eld 
(100%)
 rename test/lisp/erc/{erc-scenarios => 
}/resources/join/reconnect/foonet-again.eld (100%)
 rename test/lisp/erc/{erc-scenarios => }/resources/join/reconnect/foonet.eld 
(100%)
 rename test/lisp/erc/{erc-scenarios => 
}/resources/networks/announced-missing/foonet.eld (100%)
 rename test/lisp/erc/{erc-scenarios => 
}/resources/services/auth-source/libera.eld (100%)
 rename test/lisp/erc/{erc-scenarios => 
}/resources/services/password/libera.eld (100%)