summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2002-02-04 04:44:14 (GMT)
committerSteven Knight <knight@baldmt.com>2002-02-04 04:44:14 (GMT)
commit52fe7f7c362cacb48f33be6928c27cfc0aa5b5e5 (patch)
tree7f55b7c678210ad4d91953f512e12ea5b1a4801f /test
parent918d875dbbf44d24ac4c8400b42b804afdb66d89 (diff)
downloadSCons-52fe7f7c362cacb48f33be6928c27cfc0aa5b5e5.zip
SCons-52fe7f7c362cacb48f33be6928c27cfc0aa5b5e5.tar.gz
SCons-52fe7f7c362cacb48f33be6928c27cfc0aa5b5e5.tar.bz2
Make scons return an error code (Anthony Roach)
Diffstat (limited to 'test')
-rw-r--r--test/SConstruct.py2
-rw-r--r--test/dependency-cycle.py2
-rw-r--r--test/errors.py6
3 files changed, 5 insertions, 5 deletions
diff --git a/test/SConstruct.py b/test/SConstruct.py
index 60df1e9..de5b72e 100644
--- a/test/SConstruct.py
+++ b/test/SConstruct.py
@@ -33,7 +33,7 @@ test.run(stdout = "",
stderr = r"""
SCons error: No SConstruct file found.
File "\S+", line \d+, in \S+
-""")
+""", status=2)
test.match_func = TestCmd.match_exact
diff --git a/test/dependency-cycle.py b/test/dependency-cycle.py
index abdd50d..3be8da4 100644
--- a/test/dependency-cycle.py
+++ b/test/dependency-cycle.py
@@ -50,7 +50,7 @@ f1(void)
test.run(arguments = ".", stdout = "", stderr=r"""
SCons error: Dependency cycle: .*foo1.* -> .*foo3.* -> .*foo2.* -> .*foo1.* -> \.
.*
-""")
+""", status=2)
test.pass_test()
diff --git a/test/errors.py b/test/errors.py
index f8c5506..1f582f7 100644
--- a/test/errors.py
+++ b/test/errors.py
@@ -43,7 +43,7 @@ test.run(arguments='-f SConstruct1',
SyntaxError: invalid syntax
-""")
+""", status=2)
test.write('SConstruct2', """
@@ -57,7 +57,7 @@ test.run(arguments='-f SConstruct2',
stderr = """
SCons error: Depends\(\) require both sources and targets.
File "SConstruct2", line 4, in \?
-""")
+""", status=2)
test.write('SConstruct3', """
assert not globals().has_key("InternalError")
@@ -77,6 +77,6 @@ test.run(arguments='-f SConstruct3',
File "SConstruct3", line \d+, in \?
raise InternalError, 'error inside'
InternalError: error inside
-""")
+""", status=2)
test.pass_test()