summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorptomulik <ptomulik@meil.pw.edu.pl>2012-06-18 04:40:32 +0200
committerptomulik <ptomulik@meil.pw.edu.pl>2012-06-18 04:40:32 +0200
commit6ba903494bffcec46171a73c5c5cae347e901e39 (patch)
tree8aa7675a592bfd115ab64e9e117af487b1758536
parenta6d028252967805ec19748368e40a82c4f36e2bb (diff)
downloadscons-6ba903494bffcec46171a73c5c5cae347e901e39.tar.gz
Removed some garbage from tests (found by accident)
-rw-r--r--test/SWIG/SWIGOUTDIR.py2
-rw-r--r--test/option/debug-duplicate.py134
-rw-r--r--test/option/debug-prepare.py60
3 files changed, 0 insertions, 196 deletions
diff --git a/test/SWIG/SWIGOUTDIR.py b/test/SWIG/SWIGOUTDIR.py
index fe5b8a09..10b15753 100644
--- a/test/SWIG/SWIGOUTDIR.py
+++ b/test/SWIG/SWIGOUTDIR.py
@@ -33,8 +33,6 @@ import TestSCons
test = TestSCons.TestSCons()
-test = TestSCons.TestSCons()
-
swig = test.where_is('swig')
if not swig:
diff --git a/test/option/debug-duplicate.py b/test/option/debug-duplicate.py
index e46a5353..df2723e7 100644
--- a/test/option/debug-duplicate.py
+++ b/test/option/debug-duplicate.py
@@ -65,137 +65,3 @@ test.pass_test()
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=4 shiftwidth=4:
-#!/usr/bin/env python
-#
-# __COPYRIGHT__
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-
-__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
-
-import TestSCons
-
-_python_ = TestSCons._python_
-
-test = TestSCons.TestSCons()
-
-test.subdir('sub1')
-
-test.write('SConstruct', """\
-env=Environment()
-Export('env')
-env.SConscript('SConscript', variant_dir='Build')
-""")
-
-test.write('SConscript', """\
-Import('env')
-env.Command('foo.out', 'SConscript', Copy('$TARGET', '$SOURCE'))
-""")
-
-test.run(arguments = "--debug=duplicate -Q",
- stdout='.*relinking variant.*', match=TestSCons.match_re_dotall)
-
-test.must_exist('Build/foo.out')
-
-test.write('SConscript', """\
-# different this time!
-Import('env')
-env.Command('foo.out', 'SConscript', Copy('$TARGET', '$SOURCE'))
-""")
-
-test.run(arguments = "--debug=duplicate -Q",
- stdout='.*relinking variant.*removing existing target.*',
- match=TestSCons.match_re_dotall)
-
-test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
-#!/usr/bin/env python
-#
-# __COPYRIGHT__
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-
-__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
-
-import TestSCons
-
-_python_ = TestSCons._python_
-
-test = TestSCons.TestSCons()
-
-test.subdir('sub1')
-
-test.write('SConstruct', """\
-env=Environment()
-Export('env')
-env.SConscript('SConscript', variant_dir='Build')
-""")
-
-test.write('SConscript', """\
-Import('env')
-env.Command('foo.out', 'SConscript', Copy('$TARGET', '$SOURCE'))
-""")
-
-test.run(arguments = "--debug=duplicate -Q",
- stdout='.*relinking variant.*', match=TestSCons.match_re_dotall)
-
-test.must_exist('Build/foo.out')
-
-test.write('SConscript', """\
-# different this time!
-Import('env')
-env.Command('foo.out', 'SConscript', Copy('$TARGET', '$SOURCE'))
-""")
-
-test.run(arguments = "--debug=duplicate -Q",
- stdout='.*relinking variant.*removing existing target.*',
- match=TestSCons.match_re_dotall)
-
-test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/debug-prepare.py b/test/option/debug-prepare.py
index a29f4318..350c352e 100644
--- a/test/option/debug-prepare.py
+++ b/test/option/debug-prepare.py
@@ -58,63 +58,3 @@ test.pass_test()
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=4 shiftwidth=4:
-#!/usr/bin/env python
-#
-# __COPYRIGHT__
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-
-__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
-
-import TestSCons
-
-_python_ = TestSCons._python_
-
-test = TestSCons.TestSCons()
-
-test.write('SConstruct', """\
-env=Environment()
-dest=env.Command('foo.out', 'SConstruct',
- [Copy('$TARGET', '$SOURCE'),
- Copy('${TARGET}.extra', '$SOURCE')])
-env.SideEffect('foo.out.extra', dest)
-""")
-
-expect = """\
-Preparing target foo.out...
-...with side-effect foo.out.extra...
-...Preparing side-effect foo.out.extra...
-Copy("foo.out", "SConstruct")
-Copy("foo.out.extra", "SConstruct")
-Preparing target ....
-"""
-
-test.run(arguments = "--debug=prepare", stdout=test.wrap_stdout(expect))
-
-test.must_exist('foo.out')
-
-test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4: