summaryrefslogtreecommitdiffstats
path: root/test/Options/ListOption.py
diff options
context:
space:
mode:
Diffstat (limited to 'test/Options/ListOption.py')
-rw-r--r--test/Options/ListOption.py15
1 files changed, 5 insertions, 10 deletions
diff --git a/test/Options/ListOption.py b/test/Options/ListOption.py
index fddfc5f..b6ba306 100644
--- a/test/Options/ListOption.py
+++ b/test/Options/ListOption.py
@@ -96,8 +96,7 @@ check(['gl,qt', '0', 'gl qt', 'gl qt'])
expect_stderr = """
scons: *** Error converting option: shared
Invalid value(s) for option: foo
-File "%(SConstruct_path)s", line 14, in ?
-""" % locals()
+""" + test.python_file_line(SConstruct_path, 14)
test.run(arguments='shared=foo', stderr=expect_stderr, status=2)
@@ -106,32 +105,28 @@ test.run(arguments='shared=foo', stderr=expect_stderr, status=2)
expect_stderr = """
scons: *** Error converting option: shared
Invalid value(s) for option: foo
-File "%(SConstruct_path)s", line 14, in ?
-""" % locals()
+""" + test.python_file_line(SConstruct_path, 14)
test.run(arguments='shared=foo,ical', stderr=expect_stderr, status=2)
expect_stderr = """
scons: *** Error converting option: shared
Invalid value(s) for option: foo
-File "%(SConstruct_path)s", line 14, in ?
-""" % locals()
+""" + test.python_file_line(SConstruct_path, 14)
test.run(arguments='shared=ical,foo', stderr=expect_stderr, status=2)
expect_stderr = """
scons: *** Error converting option: shared
Invalid value(s) for option: foo
-File "%(SConstruct_path)s", line 14, in ?
-""" % locals()
+""" + test.python_file_line(SConstruct_path, 14)
test.run(arguments='shared=ical,foo,x11', stderr=expect_stderr, status=2)
expect_stderr = """
scons: *** Error converting option: shared
Invalid value(s) for option: foo,bar
-File "%(SConstruct_path)s", line 14, in ?
-""" % locals()
+""" + test.python_file_line(SConstruct_path, 14)
test.run(arguments='shared=foo,x11,,,bar', stderr=expect_stderr, status=2)