diff options
author | Takuji Tanaka <ttk@t-lab.opal.ne.jp> | 2023-08-13 13:51:08 +0000 |
---|---|---|
committer | Takuji Tanaka <ttk@t-lab.opal.ne.jp> | 2023-08-13 13:51:08 +0000 |
commit | 32f2cef09d22f153922d469c5fc6032ca5977a39 (patch) | |
tree | 93b2dfafcc386088b96febcb818b3ae2825d959f /Build/source | |
parent | 82d95db705eea57a8bed2b8795533ad1077dc519 (diff) |
cjkutils: update tests
git-svn-id: svn://tug.org/texlive/trunk@67910 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r-- | Build/source/texk/cjkutils/ChangeLog | 5 | ||||
-rwxr-xr-x | Build/source/texk/cjkutils/bg5conv.test | 16 | ||||
-rwxr-xr-x | Build/source/texk/cjkutils/cef5conv.test | 26 | ||||
-rwxr-xr-x | Build/source/texk/cjkutils/cefconv.test | 16 | ||||
-rwxr-xr-x | Build/source/texk/cjkutils/cefsconv.test | 26 | ||||
-rwxr-xr-x | Build/source/texk/cjkutils/extconv.test | 16 | ||||
-rwxr-xr-x | Build/source/texk/cjkutils/sjisconv.test | 16 |
7 files changed, 101 insertions, 20 deletions
diff --git a/Build/source/texk/cjkutils/ChangeLog b/Build/source/texk/cjkutils/ChangeLog index dc2cfbd9c3d..563e4969077 100644 --- a/Build/source/texk/cjkutils/ChangeLog +++ b/Build/source/texk/cjkutils/ChangeLog @@ -1,3 +1,8 @@ +2023-08-13 TANAKA Takuji <ttk@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@gmail.com> Import cjk-4.8.5/utils as cjkutils-4.8.5. diff --git a/Build/source/texk/cjkutils/bg5conv.test b/Build/source/texk/cjkutils/bg5conv.test index 845ea70a61b..b5de3e83195 100755 --- a/Build/source/texk/cjkutils/bg5conv.test +++ b/Build/source/texk/cjkutils/bg5conv.test @@ -4,7 +4,19 @@ # Copyright 2011 Peter Breitenlohner <tex-live@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 diff --git a/Build/source/texk/cjkutils/cef5conv.test b/Build/source/texk/cjkutils/cef5conv.test index 3d07b683089..42032665f18 100755 --- a/Build/source/texk/cjkutils/cef5conv.test +++ b/Build/source/texk/cjkutils/cef5conv.test @@ -4,19 +4,33 @@ # Copyright 2011 Peter Breitenlohner <tex-live@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 diff --git a/Build/source/texk/cjkutils/cefconv.test b/Build/source/texk/cjkutils/cefconv.test index a36940b23fc..78caba86b79 100755 --- a/Build/source/texk/cjkutils/cefconv.test +++ b/Build/source/texk/cjkutils/cefconv.test @@ -4,7 +4,19 @@ # Copyright 2011 Peter Breitenlohner <tex-live@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 diff --git a/Build/source/texk/cjkutils/cefsconv.test b/Build/source/texk/cjkutils/cefsconv.test index f9e31d9a757..61ad474f3c6 100755 --- a/Build/source/texk/cjkutils/cefsconv.test +++ b/Build/source/texk/cjkutils/cefsconv.test @@ -4,19 +4,33 @@ # Copyright 2011 Peter Breitenlohner <tex-live@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 diff --git a/Build/source/texk/cjkutils/extconv.test b/Build/source/texk/cjkutils/extconv.test index e6d08e6c464..bd05faa0c27 100755 --- a/Build/source/texk/cjkutils/extconv.test +++ b/Build/source/texk/cjkutils/extconv.test @@ -4,7 +4,19 @@ # Copyright 2011 Peter Breitenlohner <tex-live@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 diff --git a/Build/source/texk/cjkutils/sjisconv.test b/Build/source/texk/cjkutils/sjisconv.test index aca7d704b4c..2e6c09ae92e 100755 --- a/Build/source/texk/cjkutils/sjisconv.test +++ b/Build/source/texk/cjkutils/sjisconv.test @@ -4,7 +4,19 @@ # Copyright 2011 Peter Breitenlohner <tex-live@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 |