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.

diff --git a/.gitignore b/.gitignore
index e6310b644a94da5602ec2b8f1a03eaa259c8cc8f..f4d2c15f5164b8daf8583f02031490d5ba6f5d6a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -158,6 +158,7 @@ test/manual/etags/srclist
 test/manual/etags/regexfile
 test/manual/etags/ETAGS
 test/manual/etags/CTAGS
+test/manual/etags/CTAGS*.sorted
 test/manual/indent/*.new
 test/lisp/gnus/mml-sec-resources/random_seed
 test/lisp/play/fortune-resources/fortunes.dat

diff --git a/test/manual/etags/Makefile b/test/manual/etags/Makefile
index 24d8397f16cb74c21a1c69e14ae5aad41f9956aa..81b5c3ca72198f0c081b0a328d3f1a1096d78171 100644 (file)
--- a/test/manual/etags/Makefile
+++ b/test/manual/etags/Makefile
@@ -72,11 +72,15 @@ ctags_update: CTAGS.good_update ${infiles}
        head -n 100 CTAGS.good_update > CTAGS
        tail -n 100 CTAGS.good_update >> CTAGS
        ${RUN} ${CTAGS_PROG} -o CTAGS -u ${ARGS}
-       diff -u --suppress-common-lines --width=80 CTAGS.good_update CTAGS
+       sort CTAGS > CTAGS.sorted
+       sort CTAGS.good_update > CTAGS.good_update.sorted
+       diff -u --suppress-common-lines --width=80 CTAGS.good_update.sorted CTAGS.sorted
 
        cp crlf CTAGS
        ${RUN} ${CTAGS_PROG} -o CTAGS -u ${ARGS}
-       diff -u --suppress-common-lines --width=80 CTAGS.good_crlf CTAGS
+       sort CTAGS > CTAGS.sorted
+       sort CTAGS.good_crlf > CTAGS.good_crlf.sorted
+       diff -u --suppress-common-lines --width=80 CTAGS.good_crlf.sorted CTAGS.sorted
 
 ETAGS: ${infiles}
        ${RUN} ${ETAGS_PROG} ${OPTIONS} -o $@ ${ARGS}