Update test files

SamuelMarks · Nov 20, 2020 · 1a5acc9 · 1a5acc9
1 parent abb5d72
commit 1a5acc9
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/base/testfiles/github-0386.tlg b/base/testfiles/github-0386.tlg
@@ -13,6 +13,9 @@ Redirected option
 =================== 
 @ifpackagewith{pkg} (replaced file doesn't see any option): 
 -------------------
+Option in \PassOptionsToPackage
+Option in \usepackage
+Redirected option
 =============== 
 ProcessOptions: 
 ---------------

diff --git a/base/testfiles/github-0422.lvt b/base/testfiles/github-0422.lvt
@@ -55,7 +55,7 @@
 
 \makeatletter
 \declare@file@substitution{test-broken.sty}{test-fixed.sty}
-\declare@file@substitution{in-broken.sty}{in-fixed.sty}
+\declare@file@substitution{in-broken.sty}{testpath/in-fixed.sty}
 \declare@file@substitution{inputpath-broken.sty}{inputpath-fixed.sty}
 \makeatother
 
@@ -83,10 +83,10 @@
 
 \typeout{==================================================}
 
-\usepackage[opt]{testpath/in-fixed}
-% \usepackage{testpath/in-broken} % Doesn't find the file due to substitution
+\usepackage[opt]{testpath/in-broken}
+\usepackage{testpath/in-broken} % Don't load
 \usepackage{testpath/in-fixed} % Don't load
-% \usepackage[opttwo]{testpath/in-broken}\relax % Doesn't find the file due to substitution
+\usepackage[opttwo]{testpath/in-broken}\relax % Option clash
 \usepackage[opttwo]{testpath/in-fixed}\relax % Option clash
 
 \typeout{==================================================}

diff --git a/base/testfiles/github-0422.tlg b/base/testfiles/github-0422.tlg
@@ -73,6 +73,20 @@ Package: in-fixed
 (in-fixed) with 'opt'
 (inpath): I should be loaded instead.
 )
+! LaTeX Error: Option clash for package in-broken.
+See the LaTeX manual or LaTeX Companion for explanation.
+Type  H <return>  for immediate help.
+ ...                                              
+l. ...\usepackage[opttwo]{testpath/in-broken}\relax
+                                                   % Option clash
+The package in-broken has already been loaded with options:
+  [opt]
+There has now been an attempt to load it with options
+  [opttwo]
+Adding the global options:
+  opt,opttwo
+to your \documentclass declaration may fix this.
+Try typing  <return>  to proceed.
 ! LaTeX Error: Option clash for package in-fixed.
 See the LaTeX manual or LaTeX Companion for explanation.
 Type  H <return>  for immediate help.