dist: add ECH files to tarball

Also sort `EXTRA_DIST` list in `tests/Makefile.am` and make it diffable.

Follow-up to a362962b7289ec02b412890c9515657cf0ed50ac #11922
Closes #13381

diff --git a/docs/Makefile.am b/docs/Makefile.am
index bfe95239c73f1fbb2b278eb12b52267406f8aa93..83f5b0c461cc0fb02d1dcb6938d60082e6e88935 100644 (file)
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -63,6 +63,7 @@ EXTRA_DIST =                                    \
  DISTROS.md                                     \
  DYNBUF.md                                      \
  EARLY-RELEASE.md                               \
+ ECH.md                                         \
  EXPERIMENTAL.md                                \
  FAQ                                            \
  FEATURES.md                                    \

diff --git a/tests/Makefile.am b/tests/Makefile.am
index e01c93e6d78ba4d7ffeaa6ddd2f9c8ddc2784de7..7e6697f977e494441a5b18a5cec5cc802f8cd61d 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -43,15 +43,49 @@ TESTSCRIPTS = \
  test1544.pl  \
  test971.pl
 
-EXTRA_DIST = appveyor.pm azure.pm conftest.py CMakeLists.txt devtest.pl \
- dictserver.py directories.pm FILEFORMAT.md processhelp.pm ftpserver.pl \
- getpart.pm globalconfig.pm http-server.pl http2-server.pl              \
- http3-server.pl memanalyze.pl negtelnetserver.py nghttpx.conf          \
- pathhelp.pm README.md requirements.txt rtspserver.pl runner.pm         \
- runtests.1 runtests.pl secureserver.pl serverhelp.pm servers.pm        \
- smbserver.py sshhelp.pm sshserver.pl stunnel.pem testcurl.1            \
- testcurl.pl testutil.pm tftpserver.pl util.py valgrind.pm              \
- valgrind.supp $(TESTSCRIPTS)
+EXTRA_DIST =        \
+ CMakeLists.txt     \
+ FILEFORMAT.md      \
+ README.md          \
+ appveyor.pm        \
+ azure.pm           \
+ conftest.py        \
+ devtest.pl         \
+ dictserver.py      \
+ directories.pm     \
+ ech_combos.py      \
+ ech_tests.sh       \
+ ftpserver.pl       \
+ getpart.pm         \
+ globalconfig.pm    \
+ http-server.pl     \
+ http2-server.pl    \
+ http3-server.pl    \
+ memanalyze.pl      \
+ negtelnetserver.py \
+ nghttpx.conf       \
+ pathhelp.pm        \
+ processhelp.pm     \
+ requirements.txt   \
+ rtspserver.pl      \
+ runner.pm          \
+ runtests.1         \
+ runtests.pl        \
+ secureserver.pl    \
+ serverhelp.pm      \
+ servers.pm         \
+ smbserver.py       \
+ sshhelp.pm         \
+ sshserver.pl       \
+ stunnel.pem        \
+ testcurl.1         \
+ testcurl.pl        \
+ testutil.pm        \
+ tftpserver.pl      \
+ util.py            \
+ valgrind.pm        \
+ valgrind.supp      \
+ $(TESTSCRIPTS)
 
 DISTCLEANFILES = configurehelp.pm