Added fix for TeX includes with same name as subdirs.

[scons.git] / test / SConstruct.py

diff --git a/test/SConstruct.py b/test/SConstruct.py
index 48f2642a9a8b1e964056ce969656541197967a76..f061728df126eec9b3c535b523f7213f52136c35 100644 (file)
--- a/test/SConstruct.py
+++ b/test/SConstruct.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright (c) 2001, 2002 Steven Knight
+# __COPYRIGHT__
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -33,11 +33,10 @@ test.run(arguments = ".",
          status = 2,
          stdout = "",
          stderr = r"""
-SCons error: No SConstruct file found.
-File "\S+", line \d+, in \S+
-""")
+scons: \*\*\* No SConstruct file found.
+""" + TestSCons.file_expr)
 
-test.match_func = TestCmd.match_exact
+test.match_function = TestCmd.match_exact
 
 wpath = test.workpath()
 
@@ -48,7 +47,7 @@ print "sconstruct", os.getcwd()
 
 test.run(arguments = ".",
          stdout = test.wrap_stdout(read_str = 'sconstruct %s\n' % wpath,
-                                   build_str = 'scons: "." is up to date.\n'))
+                                   build_str = "scons: `.' is up to date.\n"))
 
 
 test.write('Sconstruct', """
@@ -58,7 +57,7 @@ print "Sconstruct", os.getcwd()
 
 test.run(arguments = ".",
          stdout = test.wrap_stdout(read_str = 'Sconstruct %s\n' % wpath,
-                                   build_str = 'scons: "." is up to date.\n'))
+                                   build_str = "scons: `.' is up to date.\n"))
 
 test.write('SConstruct', """
 import os
@@ -67,6 +66,12 @@ print "SConstruct", os.getcwd()
 
 test.run(arguments = ".",
          stdout = test.wrap_stdout(read_str = 'SConstruct %s\n' % wpath,
-                                   build_str = 'scons: "." is up to date.\n'))
+                                   build_str = "scons: `.' is up to date.\n"))
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4: