set found_problems after search actually fails

git-svn-id: svn://tug.org/texlive/trunk@57681 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 13 insertions, 8 deletions

diff --git a/Build/source/texk/dvipsk/Makefile.am b/Build/source/texk/dvipsk/Makefile.am
index e6c0fbc128d..58667b4f3c5 100644
--- a/Build/source/texk/dvipsk/Makefile.am
+++ b/Build/source/texk/dvipsk/Makefile.am
@@ -1,7 +1,7 @@
 ## $Id$
 ## Makefile.am for the TeX Live subdirectory texk/dvipsk/
 ##
-## Copyright 2017-2020 Karl Berry <tex-live@tug.org>
+## Copyright 2017-2021 Karl Berry <tex-live@tug.org>
 ## Copyright 2009-2015 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 ##
@@ -117,7 +117,7 @@ TESTS = afm2tfm-test.pl
 afm2tfm-test.log: afm2tfm$(EXEEXT)
 TESTS += beginfontk1.test eepic-nan.test pfbincl.test \
 	quotecmd-test.pl same-name.test test-dvips.test \
-	test-overflow-buffers.test uptex-vf.test
+	test-missing-image.test test-overflow-buffers.test uptex-vf.test
 beginfontk1.log eepic-nan.log pfbincl.log \
 	quotecmd-test.log same-name.log test-dvips.log \
 	test-overflow-buffers.log: dvips$(EXEEXT)
@@ -177,6 +177,9 @@ DISTCLEANFILES += same-name.out
 ## test-dvips
 EXTRA_DIST += testdata/dvipstst.tex testdata/dvipstst.xdv testdata/dvipstst.xps
 DISTCLEANFILES += dvipstst.ps missfont.log mtest.ps
+## test-missing-image
+EXTRA_DIST += testdata/missing-image.tex testdata/missing-image.dvi
+DISTCLEANFILES += missing-image.ps
 ## test-overflow-buffers
 EXTRA_DIST += overflow-color-push.dvi overflow-color-push.tex \
               overflow-epsfile.dvi overflow-epsfile.tex \
diff --git a/Build/source/texk/dvipsk/Makefile.in b/Build/source/texk/dvipsk/Makefile.in
index d4351625b3f..6bacfe0f7ed 100644
--- a/Build/source/texk/dvipsk/Makefile.in
+++ b/Build/source/texk/dvipsk/Makefile.in
@@ -721,7 +721,7 @@ info_TEXINFOS = dvips.texi
 dvips_TEXINFOS = contrib/config.proto dvips.help
 DISTCLEANFILES = $(DVIS) $(PSS) afmtest.tfm beginfontk1.ps \
 	eepic-nan.ps pfbincl.ps *badnews* same-name.out dvipstst.ps \
-	missfont.log mtest.ps overflow-color-push.ps \
+	missfont.log mtest.ps missing-image.ps overflow-color-push.ps \
 	overflow-epsfile.ps overflow-psbox.ps upjf.vf upjf_full.ps \
 	upjf_omit.ps
 enc_DATA = dvips-all.enc
@@ -754,6 +754,7 @@ EXTRA_DIST = $(dist_prologues) texc.script $(TESTS) testdata/8r.enc \
 	testdata/pfbincl.xps testdata/quotecmd.dvi \
 	testdata/quotecmd.tex testdata/dvipstst.tex \
 	testdata/dvipstst.xdv testdata/dvipstst.xps \
+	testdata/missing-image.tex testdata/missing-image.dvi \
 	overflow-color-push.dvi overflow-color-push.tex \
 	overflow-epsfile.dvi overflow-epsfile.tex overflow-psbox.dvi \
 	overflow-psbox.tex testdata/Makefile_upjf testdata/upjf.tex \
@@ -772,7 +773,8 @@ CLEANFILES = $(prologues) texc.lpro
 TEST_EXTENSIONS = .pl .test
 TESTS = afm2tfm-test.pl beginfontk1.test eepic-nan.test pfbincl.test \
 	quotecmd-test.pl same-name.test test-dvips.test \
-	test-overflow-buffers.test uptex-vf.test
+	test-missing-image.test test-overflow-buffers.test \
+	uptex-vf.test
 AM_TESTS_ENVIRONMENT = TEXMFCNF=$(srcdir)/../kpathsea; export \
 	TEXMFCNF; TEXCONFIG=$(srcdir)/testdata; export TEXCONFIG; \
 	TEXFONTS=$(srcdir)/testdata; export TEXFONTS; \
diff --git a/Build/source/texk/dvipsk/output.c b/Build/source/texk/dvipsk/output.c
index 51e2ded0f3a..da3b6098262 100644
--- a/Build/source/texk/dvipsk/output.c
+++ b/Build/source/texk/dvipsk/output.c
@@ -186,7 +186,6 @@ copyfile_general(const char *s, struct header_list *cur_header)
 #endif /* ! VMCMS */
 #else /*  ! (VMCMS || MVSXA) */
       sprintf(errbuf, "Could not find figure file %.500s; continuing.", s);
-      found_problems = 0; /* continue, but do not exit successfully */
       if (secure == 2) {
          strcat(errbuf, "\nNote that an absolute path or a relative path with .. are denied in -R2 mode.");
       }
@@ -238,9 +237,10 @@ copyfile_general(const char *s, struct header_list *cur_header)
       }
       break;
    }
-   if (f==NULL)
+   if (f==NULL) {
+      found_problems = 1; /* continue, but eventually exit unsuccessfully */
       error(errbuf);
-   else {
+   } else {
       if (! quiet) {
 #if defined(VMCMS) || defined (MVSXA)
          if (strlen(s) + prettycolumn > STDOUTSIZE) {
diff --git a/Build/source/texk/dvipsk/test-missing-image.test b/Build/source/texk/dvipsk/test-missing-image.test
index 86cb8a49f57..689d807b8fa 100755
--- a/Build/source/texk/dvipsk/test-missing-image.test
+++ b/Build/source/texk/dvipsk/test-missing-image.test
@@ -7,7 +7,7 @@
 # make -C $wp TESTS=test-missing-image.test check 
 # where wp=.../Work/texk/dvipsk
 
-if ./dvips $srcdir/testdata/missing-image.dvi -o dvipstst.ps; then
+if ./dvips $srcdir/testdata/missing-image.dvi -o missing-image.ps; then
   echo "$0: found image file, but shouldn't have." >&2
   exit 1
 fi