[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 89a10ffcc4: Fix the new ctags test
From: |
Eli Zaretskii |
Subject: |
master 89a10ffcc4: Fix the new ctags test |
Date: |
Sun, 27 Nov 2022 13:02:53 -0500 (EST) |
branch: master
commit 89a10ffcc49c5832619649b7876cc339fa9d0dcf
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>
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.
---
.gitignore | 1 +
test/manual/etags/Makefile | 8 ++++++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/.gitignore b/.gitignore
index e6310b644a..f4d2c15f51 100644
--- 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 24d8397f16..81b5c3ca72 100644
--- 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}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 89a10ffcc4: Fix the new ctags test,
Eli Zaretskii <=