Error message if no SConstruct file.

2 files changed, 17 insertions, 3 deletions

diff --git a/test/SConstruct.py b/test/SConstruct.py
index 34710a3..8837b62 100644
--- a/test/SConstruct.py
+++ b/test/SConstruct.py
@@ -6,6 +6,12 @@ import TestSCons
 
 test = TestSCons.TestSCons()
 
+test.run(stdout = "",
+	stderr = """
+SCons error: No SConstruct file found.
+File "\S+scons(\.py)?", line \d+, in main
+""")
+
 wpath = test.workpath()
 
 test.write('sconstruct', """
diff --git a/test/errors.py b/test/errors.py
index 3c8663b..f94ebe5 100644
--- a/test/errors.py
+++ b/test/errors.py
@@ -10,7 +10,9 @@ test.write('SConstruct1', """
 a ! x
 """)
 
-test.run(arguments='-f SConstruct1', stderr = """  File "SConstruct1", line 2
+test.run(arguments='-f SConstruct1',
+	 stdout = "",
+	 stderr = """  File "SConstruct1", line 2
 
     a ! x
 
@@ -24,7 +26,10 @@ SyntaxError: invalid syntax
 test.write('SConstruct2', """
 raise UserError, 'Depends() require both sources and targets.'
 """)
-test.run(arguments='-f SConstruct2', stderr = """
+
+test.run(arguments='-f SConstruct2',
+	 stdout = "",
+	 stderr = """
 SCons error: Depends\(\) require both sources and targets.
 File "SConstruct2", line 2, in \?
 """)
@@ -32,7 +37,10 @@ File "SConstruct2", line 2, in \?
 test.write('SConstruct3', """
 raise InternalError, 'error inside'
 """)
-test.run(arguments='-f SConstruct3', stderr = r"""Traceback \((most recent call|innermost) last\):
+
+test.run(arguments='-f SConstruct3',
+	 stdout = "other errors\n",
+	 stderr = r"""Traceback \((most recent call|innermost) last\):
   File ".*scons(\.py)?", line \d+, in \?
     main\(\)
   File ".*scons(\.py)?", line \d+, in main