Added fix for TeX includes with same name as subdirs.

[scons.git] / test / TEX / auxiliaries.py

diff --git a/test/TEX/auxiliaries.py b/test/TEX/auxiliaries.py
index e189d5745b3912abb163b978aa04e0b50d0820c8..f69b6e66c930e3d1235f3c4154c27c1a4bca72f5 100644 (file)
--- a/test/TEX/auxiliaries.py
+++ b/test/TEX/auxiliaries.py
@@ -52,14 +52,15 @@ if not dvips or not latex:
 test.subdir(['docs'])
 
 test.write(['SConstruct'], """\
+import os
 env = Environment(tools = ['pdftex', 'dvipdf', 'dvips', 'tex', 'latex'],
-                  ENV = {},
+                  ENV = {'PATH' : os.environ['PATH']},
                   BUILD_DIR = '#build/docs')
 
 # Use 'duplicate=1' because LaTeX toolchain does not work properly for
 # input/output files outside of the current directory
 
-env.BuildDir('$BUILD_DIR', 'docs', duplicate=1)
+env.VariantDir('$BUILD_DIR', 'docs', duplicate=1)
 env.SConscript('$BUILD_DIR/SConscript', exports = ['env'])
 """)
 
@@ -141,7 +142,7 @@ if pdf_output_1 != pdf_output_2:
     import sys
     test.write(['build', 'docs', 'test.normalized.1.pdf'], pdf_output_1)
     test.write(['build', 'docs', 'test.normalized.2.pdf'], pdf_output_2)
-    sys.stdout.write("***** 1 and 2 are different!\n")
+    sys.stdout.write("***** 1.pdf and 2.pdf are different!\n")
     sys.stdout.write(test.diff_substr(pdf_output_1, pdf_output_2, 80, 80) + '\n')
     sys.stdout.write("Output from run 1:\n")
     sys.stdout.write(test.stdout(-1) + '\n')
@@ -150,8 +151,23 @@ if pdf_output_1 != pdf_output_2:
     sys.stdout.flush()
     test.fail_test()
 
-assert ps_output_1 == ps_output_2,      test.diff_substr(ps_output_1, ps_output_2, 80, 80)
+if ps_output_1 != ps_output_2:
+    import sys
+    sys.stdout.write("***** 1.ps and 2.ps are different!\n")
+    sys.stdout.write(test.diff_substr(ps_output_1, ps_output_2, 80, 80) + '\n')
+    sys.stdout.write("Output from run 1:\n")
+    sys.stdout.write(test.stdout(-1) + '\n')
+    sys.stdout.write("Output from run 2:\n")
+    sys.stdout.write(test.stdout() + '\n')
+    sys.stdout.flush()
+    test.fail_test()
 
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4: