aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2022-11-27 20:01:50 +0200
committerEli Zaretskii2022-11-27 20:01:50 +0200
commit89a10ffcc49c5832619649b7876cc339fa9d0dcf (patch)
tree32b22222d78f9f7d2340fd9d766b28c85c7b671c
parent7bf393dcf0d905b947e5f5311815a08586ced0b0 (diff)
downloademacs-89a10ffcc49c5832619649b7876cc339fa9d0dcf.tar.gz
emacs-89a10ffcc49c5832619649b7876cc339fa9d0dcf.zip
Fix the new ctags test
* test/manual/etags/Makefile (ctags_update): Sort CTAGS* files before comparing. Patch by lu4nx <lx@shellcodes.org>. (Bug#59544) * .gitignore: Ignore CTAGS*.sorted files.
-rw-r--r--.gitignore1
-rw-r--r--test/manual/etags/Makefile8
2 files changed, 7 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index e6310b644a9..f4d2c15f516 100644
--- a/.gitignore
+++ b/.gitignore
@@ -158,6 +158,7 @@ test/manual/etags/srclist
158test/manual/etags/regexfile 158test/manual/etags/regexfile
159test/manual/etags/ETAGS 159test/manual/etags/ETAGS
160test/manual/etags/CTAGS 160test/manual/etags/CTAGS
161test/manual/etags/CTAGS*.sorted
161test/manual/indent/*.new 162test/manual/indent/*.new
162test/lisp/gnus/mml-sec-resources/random_seed 163test/lisp/gnus/mml-sec-resources/random_seed
163test/lisp/play/fortune-resources/fortunes.dat 164test/lisp/play/fortune-resources/fortunes.dat
diff --git a/test/manual/etags/Makefile b/test/manual/etags/Makefile
index 24d8397f16c..81b5c3ca721 100644
--- a/test/manual/etags/Makefile
+++ b/test/manual/etags/Makefile
@@ -72,11 +72,15 @@ ctags_update: CTAGS.good_update ${infiles}
72 head -n 100 CTAGS.good_update > CTAGS 72 head -n 100 CTAGS.good_update > CTAGS
73 tail -n 100 CTAGS.good_update >> CTAGS 73 tail -n 100 CTAGS.good_update >> CTAGS
74 ${RUN} ${CTAGS_PROG} -o CTAGS -u ${ARGS} 74 ${RUN} ${CTAGS_PROG} -o CTAGS -u ${ARGS}
75 diff -u --suppress-common-lines --width=80 CTAGS.good_update CTAGS 75 sort CTAGS > CTAGS.sorted
76 sort CTAGS.good_update > CTAGS.good_update.sorted
77 diff -u --suppress-common-lines --width=80 CTAGS.good_update.sorted CTAGS.sorted
76 78
77 cp crlf CTAGS 79 cp crlf CTAGS
78 ${RUN} ${CTAGS_PROG} -o CTAGS -u ${ARGS} 80 ${RUN} ${CTAGS_PROG} -o CTAGS -u ${ARGS}
79 diff -u --suppress-common-lines --width=80 CTAGS.good_crlf CTAGS 81 sort CTAGS > CTAGS.sorted
82 sort CTAGS.good_crlf > CTAGS.good_crlf.sorted
83 diff -u --suppress-common-lines --width=80 CTAGS.good_crlf.sorted CTAGS.sorted
80 84
81ETAGS: ${infiles} 85ETAGS: ${infiles}
82 ${RUN} ${ETAGS_PROG} ${OPTIONS} -o $@ ${ARGS} 86 ${RUN} ${ETAGS_PROG} ${OPTIONS} -o $@ ${ARGS}