texlive[67910] Build/source/texk/cjkutils: cjkutils: update tests
commits+takuji at tug.org
commits+takuji at tug.org
Sun Aug 13 15:51:08 CEST 2023
Revision: 67910
http://tug.org/svn/texlive?view=revision&revision=67910
Author: takuji
Date: 2023-08-13 15:51:08 +0200 (Sun, 13 Aug 2023)
Log Message:
-----------
cjkutils: update tests
Modified Paths:
--------------
trunk/Build/source/texk/cjkutils/ChangeLog
trunk/Build/source/texk/cjkutils/bg5conv.test
trunk/Build/source/texk/cjkutils/cef5conv.test
trunk/Build/source/texk/cjkutils/cefconv.test
trunk/Build/source/texk/cjkutils/cefsconv.test
trunk/Build/source/texk/cjkutils/extconv.test
trunk/Build/source/texk/cjkutils/sjisconv.test
Modified: trunk/Build/source/texk/cjkutils/ChangeLog
===================================================================
--- trunk/Build/source/texk/cjkutils/ChangeLog 2023-08-13 13:51:02 UTC (rev 67909)
+++ trunk/Build/source/texk/cjkutils/ChangeLog 2023-08-13 13:51:08 UTC (rev 67910)
@@ -1,3 +1,8 @@
+2023-08-13 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
+
+ * {bg5conv,cef5conv,cefconv,cefsconv,extconv,sjisconv}.test:
+ Make easier to test on Windows.
+
2022-01-22 Hironobu Yamashita <h.y.acetaminophen at gmail.com>
Import cjk-4.8.5/utils as cjkutils-4.8.5.
Modified: trunk/Build/source/texk/cjkutils/bg5conv.test
===================================================================
--- trunk/Build/source/texk/cjkutils/bg5conv.test 2023-08-13 13:51:02 UTC (rev 67909)
+++ trunk/Build/source/texk/cjkutils/bg5conv.test 2023-08-13 13:51:08 UTC (rev 67910)
@@ -4,7 +4,19 @@
# Copyright 2011 Peter Breitenlohner <tex-live at tug.org>
# You may freely use, modify and/or distribute this file.
-./bg5conv <$srcdir/tests/bg5conv.tex >bg5conv.cjk \
- && diff bg5conv.cjk $srcdir/tests/bg5conv.cjk \
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_bg5conv=$BinDir/bg5conv$ExeExt
+
+# pre-generated test results in the repository are stored in LF
+# but the output might be written in CRLF on some platform.
+# if 'diff --strip-trailing-cr' is available, exploit it.
+# (useful for tests on win32 binaries run on MSYS shell)
+DIFF="diff"
+$DIFF --strip-trailing-cr $0 $0 \
+ && DIFF="diff --strip-trailing-cr" || echo
+
+$_bg5conv <$srcdir/tests/bg5conv.tex >bg5conv.cjk \
+ && $DIFF bg5conv.cjk $srcdir/tests/bg5conv.cjk \
|| exit 1
Modified: trunk/Build/source/texk/cjkutils/cef5conv.test
===================================================================
--- trunk/Build/source/texk/cjkutils/cef5conv.test 2023-08-13 13:51:02 UTC (rev 67909)
+++ trunk/Build/source/texk/cjkutils/cef5conv.test 2023-08-13 13:51:08 UTC (rev 67910)
@@ -4,19 +4,33 @@
# Copyright 2011 Peter Breitenlohner <tex-live at tug.org>
# You may freely use, modify and/or distribute this file.
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_cef5conv=$BinDir/cef5conv$ExeExt
+_bg5conv=$BinDir/bg5conv$ExeExt
+_cefconv=$BinDir/cefconv$ExeExt
+
+# pre-generated test results in the repository are stored in LF
+# but the output might be written in CRLF on some platform.
+# if 'diff --strip-trailing-cr' is available, exploit it.
+# (useful for tests on win32 binaries run on MSYS shell)
+DIFF="diff"
+$DIFF --strip-trailing-cr $0 $0 \
+ && DIFF="diff --strip-trailing-cr" || echo
+
LC_ALL=C; export LC_ALL; LANGUAGE=C; export LANGUAGE
-./cef5conv <$srcdir/tests/cef5conv.tex >cef5conv.cjk \
- && diff cef5conv.cjk $srcdir/tests/cef5conv.cjk \
+$_cef5conv <$srcdir/tests/cef5conv.tex >cef5conv.cjk \
+ && $DIFF cef5conv.cjk $srcdir/tests/cef5conv.cjk \
|| exit 1
-./bg5conv <$srcdir/tests/cef5conv.tex | ./cefconv \
+$_bg5conv <$srcdir/tests/cef5conv.tex | $_cefconv \
| sed 's/cefconv.*bg5conv/cef5conv/' >cef5conv.cjk \
- && diff cef5conv.cjk $srcdir/tests/cef5conv.cjk \
+ && $DIFF cef5conv.cjk $srcdir/tests/cef5conv.cjk \
|| exit 1
-./cefconv <$srcdir/tests/cef5conv.tex | ./bg5conv \
+$_cefconv <$srcdir/tests/cef5conv.tex | $_bg5conv \
| sed 's/CJKpreproc.*CNSpreproc/CNSpreproc/;s/cefconv/cef5conv/' >cef5conv.cjk \
- && diff cef5conv.cjk $srcdir/tests/cef5conv.cjk \
+ && $DIFF cef5conv.cjk $srcdir/tests/cef5conv.cjk \
|| exit 1
Modified: trunk/Build/source/texk/cjkutils/cefconv.test
===================================================================
--- trunk/Build/source/texk/cjkutils/cefconv.test 2023-08-13 13:51:02 UTC (rev 67909)
+++ trunk/Build/source/texk/cjkutils/cefconv.test 2023-08-13 13:51:08 UTC (rev 67910)
@@ -4,7 +4,19 @@
# Copyright 2011 Peter Breitenlohner <tex-live at tug.org>
# You may freely use, modify and/or distribute this file.
-./cefconv <$srcdir/tests/cefconv.tex >cefconv.cjk \
- && diff cefconv.cjk $srcdir/tests/cefconv.cjk \
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_cefconv=$BinDir/cefconv$ExeExt
+
+# pre-generated test results in the repository are stored in LF
+# but the output might be written in CRLF on some platform.
+# if 'diff --strip-trailing-cr' is available, exploit it.
+# (useful for tests on win32 binaries run on MSYS shell)
+DIFF="diff"
+$DIFF --strip-trailing-cr $0 $0 \
+ && DIFF="diff --strip-trailing-cr" || echo
+
+$_cefconv <$srcdir/tests/cefconv.tex >cefconv.cjk \
+ && $DIFF cefconv.cjk $srcdir/tests/cefconv.cjk \
|| exit 1
Modified: trunk/Build/source/texk/cjkutils/cefsconv.test
===================================================================
--- trunk/Build/source/texk/cjkutils/cefsconv.test 2023-08-13 13:51:02 UTC (rev 67909)
+++ trunk/Build/source/texk/cjkutils/cefsconv.test 2023-08-13 13:51:08 UTC (rev 67910)
@@ -4,19 +4,33 @@
# Copyright 2011 Peter Breitenlohner <tex-live at tug.org>
# You may freely use, modify and/or distribute this file.
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_cefsconv=$BinDir/cefsconv$ExeExt
+_sjisconv=$BinDir/sjisconv$ExeExt
+_cefconv=$BinDir/cefconv$ExeExt
+
+# pre-generated test results in the repository are stored in LF
+# but the output might be written in CRLF on some platform.
+# if 'diff --strip-trailing-cr' is available, exploit it.
+# (useful for tests on win32 binaries run on MSYS shell)
+DIFF="diff"
+$DIFF --strip-trailing-cr $0 $0 \
+ && DIFF="diff --strip-trailing-cr" || echo
+
LC_ALL=C; export LC_ALL; LANGUAGE=C; export LANGUAGE
-./cefsconv <$srcdir/tests/cefsconv.tex >cefsconv.cjk \
- && diff cefsconv.cjk $srcdir/tests/cefsconv.cjk \
+$_cefsconv <$srcdir/tests/cefsconv.tex >cefsconv.cjk \
+ && $DIFF cefsconv.cjk $srcdir/tests/cefsconv.cjk \
|| exit 1
-./sjisconv <$srcdir/tests/cefsconv.tex | ./cefconv \
+$_sjisconv <$srcdir/tests/cefsconv.tex | $_cefconv \
| sed 's/cefconv.*sjisconv/cefsconv/' >cefsconv.cjk \
- && diff cefsconv.cjk $srcdir/tests/cefsconv.cjk \
+ && $DIFF cefsconv.cjk $srcdir/tests/cefsconv.cjk \
|| exit 1
-./cefconv <$srcdir/tests/cefsconv.tex | ./sjisconv \
+$_cefconv <$srcdir/tests/cefsconv.tex | $_sjisconv \
| sed 's/CJKpreproc.*CNSpreproc/CNSpreproc/;s/cefconv/cefsconv/' >cefsconv.cjk \
- && diff cefsconv.cjk $srcdir/tests/cefsconv.cjk \
+ && $DIFF cefsconv.cjk $srcdir/tests/cefsconv.cjk \
|| exit 1
Modified: trunk/Build/source/texk/cjkutils/extconv.test
===================================================================
--- trunk/Build/source/texk/cjkutils/extconv.test 2023-08-13 13:51:02 UTC (rev 67909)
+++ trunk/Build/source/texk/cjkutils/extconv.test 2023-08-13 13:51:08 UTC (rev 67910)
@@ -4,7 +4,19 @@
# Copyright 2011 Peter Breitenlohner <tex-live at tug.org>
# You may freely use, modify and/or distribute this file.
-./extconv <$srcdir/tests/extconv.tex >extconv.cjk \
- && diff extconv.cjk $srcdir/tests/extconv.cjk \
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_extconv=$BinDir/extconv$ExeExt
+
+# pre-generated test results in the repository are stored in LF
+# but the output might be written in CRLF on some platform.
+# if 'diff --strip-trailing-cr' is available, exploit it.
+# (useful for tests on win32 binaries run on MSYS shell)
+DIFF="diff"
+$DIFF --strip-trailing-cr $0 $0 \
+ && DIFF="diff --strip-trailing-cr" || echo
+
+$_extconv <$srcdir/tests/extconv.tex >extconv.cjk \
+ && $DIFF extconv.cjk $srcdir/tests/extconv.cjk \
|| exit 1
Modified: trunk/Build/source/texk/cjkutils/sjisconv.test
===================================================================
--- trunk/Build/source/texk/cjkutils/sjisconv.test 2023-08-13 13:51:02 UTC (rev 67909)
+++ trunk/Build/source/texk/cjkutils/sjisconv.test 2023-08-13 13:51:08 UTC (rev 67910)
@@ -4,7 +4,19 @@
# Copyright 2011 Peter Breitenlohner <tex-live at tug.org>
# You may freely use, modify and/or distribute this file.
-./sjisconv <$srcdir/tests/sjisconv.tex >sjisconv.cjk \
- && diff sjisconv.cjk $srcdir/tests/sjisconv.cjk \
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_sjisconv=$BinDir/sjisconv$ExeExt
+
+# pre-generated test results in the repository are stored in LF
+# but the output might be written in CRLF on some platform.
+# if 'diff --strip-trailing-cr' is available, exploit it.
+# (useful for tests on win32 binaries run on MSYS shell)
+DIFF="diff"
+$DIFF --strip-trailing-cr $0 $0 \
+ && DIFF="diff --strip-trailing-cr" || echo
+
+$_sjisconv <$srcdir/tests/sjisconv.tex >sjisconv.cjk \
+ && $DIFF sjisconv.cjk $srcdir/tests/sjisconv.cjk \
|| exit 1
More information about the tex-live-commits
mailing list.