summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorRussel Winder <russel@winder.org.uk>2014-09-15 17:52:28 (GMT)
committerRussel Winder <russel@winder.org.uk>2014-09-15 17:52:28 (GMT)
commit31a6b57a62dcbdfcb4b059feb4a9ea93793c3e70 (patch)
tree7cc66513d74e4f187bd29d61ca22364c3038e27a /test
parent811d3f2115eae697a0132d11d07df54163f3479b (diff)
downloadSCons-31a6b57a62dcbdfcb4b059feb4a9ea93793c3e70.zip
SCons-31a6b57a62dcbdfcb4b059feb4a9ea93793c3e70.tar.gz
SCons-31a6b57a62dcbdfcb4b059feb4a9ea93793c3e70.tar.bz2
And all the rest of the {} in format strings made Python 2.6 compatible.
Diffstat (limited to 'test')
-rw-r--r--test/D/CoreScanner/Common/common.py2
-rw-r--r--test/D/HSTeoh/Common/linkingProblem.py2
-rw-r--r--test/D/HSTeoh/Common/singleStringCannotBeMultipleOptions.py2
-rw-r--r--test/D/HelloWorld/CompileAndLinkOneStep/Common/common.py2
-rw-r--r--test/D/HelloWorld/CompileThenLinkTwoSteps/Common/common.py2
-rw-r--r--test/D/MixedDAndC/Common/common.py2
-rw-r--r--test/D/SharedObjects/Common/common.py2
7 files changed, 7 insertions, 7 deletions
diff --git a/test/D/CoreScanner/Common/common.py b/test/D/CoreScanner/Common/common.py
index 657e83e..1d2fde0 100644
--- a/test/D/CoreScanner/Common/common.py
+++ b/test/D/CoreScanner/Common/common.py
@@ -44,7 +44,7 @@ def testForTool(tool):
_obj = TestSCons._obj
if not isExecutableOfToolAvailable(test, tool) :
- test.skip_test("Required executable for tool '{}' not found, skipping test.\n".format(tool))
+ test.skip_test("Required executable for tool '{0}' not found, skipping test.\n".format(tool))
test.dir_fixture('Image')
test.write('SConstruct', open('SConstruct_template', 'r').read().format(tool))
diff --git a/test/D/HSTeoh/Common/linkingProblem.py b/test/D/HSTeoh/Common/linkingProblem.py
index 59b409f..46351b3 100644
--- a/test/D/HSTeoh/Common/linkingProblem.py
+++ b/test/D/HSTeoh/Common/linkingProblem.py
@@ -41,7 +41,7 @@ def testForTool(tool):
test = TestSCons.TestSCons()
if not isExecutableOfToolAvailable(test, tool) :
- test.skip_test("Required executable for tool '{}' not found, skipping test.\n".format(tool))
+ test.skip_test("Required executable for tool '{0}' not found, skipping test.\n".format(tool))
test.dir_fixture('LinkingProblem')
test.write('SConstruct', open('SConstruct_template', 'r').read().format(tool))
diff --git a/test/D/HSTeoh/Common/singleStringCannotBeMultipleOptions.py b/test/D/HSTeoh/Common/singleStringCannotBeMultipleOptions.py
index 4dabf7b..26b477b 100644
--- a/test/D/HSTeoh/Common/singleStringCannotBeMultipleOptions.py
+++ b/test/D/HSTeoh/Common/singleStringCannotBeMultipleOptions.py
@@ -42,7 +42,7 @@ def testForTool(tool):
test = TestSCons.TestSCons()
if not isExecutableOfToolAvailable(test, tool) :
- test.skip_test("Required executable for tool '{}' not found, skipping test.\n".format(tool))
+ test.skip_test("Required executable for tool '{0}' not found, skipping test.\n".format(tool))
test.dir_fixture('SingleStringCannotBeMultipleOptions')
test.write('SConstruct', open('SConstruct_template', 'r').read().format(tool))
diff --git a/test/D/HelloWorld/CompileAndLinkOneStep/Common/common.py b/test/D/HelloWorld/CompileAndLinkOneStep/Common/common.py
index 618041b..e757d47 100644
--- a/test/D/HelloWorld/CompileAndLinkOneStep/Common/common.py
+++ b/test/D/HelloWorld/CompileAndLinkOneStep/Common/common.py
@@ -41,7 +41,7 @@ def testForTool(tool):
test = TestSCons.TestSCons()
if not isExecutableOfToolAvailable(test, tool) :
- test.skip_test("Required executable for tool '{}' not found, skipping test.\n".format(tool))
+ test.skip_test("Required executable for tool '{0}' not found, skipping test.\n".format(tool))
test.dir_fixture('Image')
test.write('SConstruct', open('SConstruct_template', 'r').read().format(tool))
diff --git a/test/D/HelloWorld/CompileThenLinkTwoSteps/Common/common.py b/test/D/HelloWorld/CompileThenLinkTwoSteps/Common/common.py
index 618041b..e757d47 100644
--- a/test/D/HelloWorld/CompileThenLinkTwoSteps/Common/common.py
+++ b/test/D/HelloWorld/CompileThenLinkTwoSteps/Common/common.py
@@ -41,7 +41,7 @@ def testForTool(tool):
test = TestSCons.TestSCons()
if not isExecutableOfToolAvailable(test, tool) :
- test.skip_test("Required executable for tool '{}' not found, skipping test.\n".format(tool))
+ test.skip_test("Required executable for tool '{0}' not found, skipping test.\n".format(tool))
test.dir_fixture('Image')
test.write('SConstruct', open('SConstruct_template', 'r').read().format(tool))
diff --git a/test/D/MixedDAndC/Common/common.py b/test/D/MixedDAndC/Common/common.py
index 66c738f..c9ecb6a 100644
--- a/test/D/MixedDAndC/Common/common.py
+++ b/test/D/MixedDAndC/Common/common.py
@@ -41,7 +41,7 @@ def testForTool(tool):
test = TestSCons.TestSCons()
if not isExecutableOfToolAvailable(test, tool) :
- test.skip_test("Required executable for tool '{}' not found, skipping test.\n".format(tool))
+ test.skip_test("Required executable for tool '{0}' not found, skipping test.\n".format(tool))
test.dir_fixture('Image')
diff --git a/test/D/SharedObjects/Common/common.py b/test/D/SharedObjects/Common/common.py
index e608fdb..cb1e71b 100644
--- a/test/D/SharedObjects/Common/common.py
+++ b/test/D/SharedObjects/Common/common.py
@@ -43,7 +43,7 @@ def testForTool(tool):
test = TestSCons.TestSCons()
if not isExecutableOfToolAvailable(test, tool) :
- test.skip_test("Required executable for tool '{}' not found, skipping test.\n".format(tool))
+ test.skip_test("Required executable for tool '{0}' not found, skipping test.\n".format(tool))
if tool == 'gdc':