From 01082e83bbd3676cd126bcd9a0fd1a0a77366978 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Mon, 3 Apr 2017 14:24:06 -0400 Subject: py2/3 another module shadowing issue... test file bz2.py blocking python lib module bz2.py --- test/packaging/tar/bz2.py | 69 ------------------------------------- test/packaging/tar/bz2_packaging.py | 69 +++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 69 deletions(-) delete mode 100644 test/packaging/tar/bz2.py create mode 100644 test/packaging/tar/bz2_packaging.py diff --git a/test/packaging/tar/bz2.py b/test/packaging/tar/bz2.py deleted file mode 100644 index 1552fd1..0000000 --- a/test/packaging/tar/bz2.py +++ /dev/null @@ -1,69 +0,0 @@ -#!/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__" - -""" -This tests the SRC bz2 packager, which does the following: - - create a tar package from the specified files -""" - -import TestSCons - -python = TestSCons.python - -test = TestSCons.TestSCons() - -tar = test.detect('TAR', 'tar') - -if tar: - test.subdir('src') - - test.write( [ 'src', 'main.c' ], r""" -int main( int argc, char* argv[] ) -{ - return 0; -} -""") - - test.write('SConstruct', """ -Program( 'src/main.c' ) -env=Environment(tools=['default', 'packaging']) -env.Package( PACKAGETYPE = 'src_tarbz2', - target = 'src.tar.bz2', - PACKAGEROOT = 'test', - source = [ 'src/main.c', 'SConstruct' ] ) -""") - - test.run(arguments='', stderr = None) - - test.must_exist( 'src.tar.bz2' ) - -test.pass_test() - -# Local Variables: -# tab-width:4 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=4 shiftwidth=4: diff --git a/test/packaging/tar/bz2_packaging.py b/test/packaging/tar/bz2_packaging.py new file mode 100644 index 0000000..1552fd1 --- /dev/null +++ b/test/packaging/tar/bz2_packaging.py @@ -0,0 +1,69 @@ +#!/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__" + +""" +This tests the SRC bz2 packager, which does the following: + - create a tar package from the specified files +""" + +import TestSCons + +python = TestSCons.python + +test = TestSCons.TestSCons() + +tar = test.detect('TAR', 'tar') + +if tar: + test.subdir('src') + + test.write( [ 'src', 'main.c' ], r""" +int main( int argc, char* argv[] ) +{ + return 0; +} +""") + + test.write('SConstruct', """ +Program( 'src/main.c' ) +env=Environment(tools=['default', 'packaging']) +env.Package( PACKAGETYPE = 'src_tarbz2', + target = 'src.tar.bz2', + PACKAGEROOT = 'test', + source = [ 'src/main.c', 'SConstruct' ] ) +""") + + test.run(arguments='', stderr = None) + + test.must_exist( 'src.tar.bz2' ) + +test.pass_test() + +# Local Variables: +# tab-width:4 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=4 shiftwidth=4: -- cgit v0.12