texlive[67877] Build/source/texk/dvidvi: dvidvi: update tests

[commits+takuji at tug.org]

Revision: 67877
          http://tug.org/svn/texlive?view=revision&revision=67877
Author:   takuji
Date:     2023-08-11 13:46:10 +0200 (Fri, 11 Aug 2023)
Log Message:
-----------
dvidvi: update tests

Modified Paths:
--------------
    trunk/Build/source/texk/dvidvi/ChangeLog
    trunk/Build/source/texk/dvidvi/dvidvi.c
    trunk/Build/source/texk/dvidvi/dvidvi.test

Modified: trunk/Build/source/texk/dvidvi/ChangeLog
===================================================================
--- trunk/Build/source/texk/dvidvi/ChangeLog	2023-08-11 11:46:06 UTC (rev 67876)
+++ trunk/Build/source/texk/dvidvi/ChangeLog	2023-08-11 11:46:10 UTC (rev 67877)
@@ -1,3 +1,11 @@
+2023-08-11  TANAKA Takuji  <ttk at t-lab.opal.ne.jp>
+
+	* dvidvi.c:
+        Skip Unicode conversion if command line arguments are missing
+        in order to prevent unwanted looking for texmf.cnf. (Windows only)
+	* dvidvi.test:
+	Make easier to test on Windows.
+
 2021-02-19  Karl Berry  <karl at freefriends.org>
 
 	* dvidvi.test,

Modified: trunk/Build/source/texk/dvidvi/dvidvi.c
===================================================================
--- trunk/Build/source/texk/dvidvi/dvidvi.c	2023-08-11 11:46:06 UTC (rev 67876)
+++ trunk/Build/source/texk/dvidvi/dvidvi.c	2023-08-11 11:46:10 UTC (rev 67877)
@@ -1256,11 +1256,13 @@
 #if defined(WIN32) && defined(KPATHSEA)
    int ac;
    char **av, *enc;
-   kpse_set_program_name(argv[0], "dvidvi");
-   enc = kpse_var_value("command_line_encoding");
-   if (get_command_line_args_utf8(enc, &ac, &av)) {
-      argc = ac;
-      argv = av;
+   if (argc>1) {
+      kpse_set_program_name(argv[0], "dvidvi");
+      enc = kpse_var_value("command_line_encoding");
+      if (get_command_line_args_utf8(enc, &ac, &av)) {
+         argc = ac;
+         argv = av;
+      }
    }
 #endif
    processargs(argc, argv) ;

Modified: trunk/Build/source/texk/dvidvi/dvidvi.test
===================================================================
--- trunk/Build/source/texk/dvidvi/dvidvi.test	2023-08-11 11:46:06 UTC (rev 67876)
+++ trunk/Build/source/texk/dvidvi/dvidvi.test	2023-08-11 11:46:10 UTC (rev 67877)
@@ -4,20 +4,34 @@
 # Copyright 2011 Peter Breitenlohner <tex-live at tug.org>
 # You may freely use, modify and/or distribute this file.
 
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_dvidvi=$BinDir/dvidvi$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
+
+
 rm -rf play*
 cp $srcdir/tests/play.dvi .
-./dvidvi -f 5 -l @25 -m'4:-3,0(6,0)' play playout 2>playout.2
+$_dvidvi -f 5 -l @25 -m'4:-3,0(6,0)' play playout 2>playout.2
 #
 # Eliminate version number for the comparison.
 grep -v '^This is dvidvi' playout.2 \
-| diff - $srcdir/tests/playout.2 \
+| $DIFF - $srcdir/tests/playout.2 \
 || exit 1
 
 rm -rf play*
 cp $srcdir/tests/playtate.dvi .
-./dvidvi -f 5 -l @25 -m'4:-3,0(6,0)' playtate playout 2>playout.3
+$_dvidvi -f 5 -l @25 -m'4:-3,0(6,0)' playtate playout 2>playout.3
 #
 grep -v '^This is dvidvi' playout.3 \
-| diff - $srcdir/tests/playout.3 \
-|| exit 1
+| $DIFF - $srcdir/tests/playout.3 \
+|| exit 2
 
+exit 0