diff options
Diffstat (limited to 'test/Deprecated/SourceCode/SCCS/diskcheck.py')
-rw-r--r-- | test/Deprecated/SourceCode/SCCS/diskcheck.py | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/test/Deprecated/SourceCode/SCCS/diskcheck.py b/test/Deprecated/SourceCode/SCCS/diskcheck.py index a8660bc..774a92c 100644 --- a/test/Deprecated/SourceCode/SCCS/diskcheck.py +++ b/test/Deprecated/SourceCode/SCCS/diskcheck.py @@ -20,7 +20,6 @@ # 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__" @@ -28,18 +27,29 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" Test transparent checkouts from SCCS files in an SCCS subdirectory. """ -import os.path +import os import TestSCons test = TestSCons.TestSCons() +test.write('SConscript', """ +Environment(tools = ['SCCS']).SCCS() +""") + +msg_sccs = """The SCCS() factory is deprecated and there is no replacement.""" +warn_sccs = test.deprecated_fatal('deprecated-build-dir', msg_sccs) +msg_sc = """SourceCode() has been deprecated and there is no replacement. +\tIf you need this function, please contact dev@scons.tigris.org.""" +warn_sc = test.deprecated_wrap(msg_sc) + +test.skip_test("Need SCCS to debug these tests.\n") + sccs = test.where_is('sccs') if not sccs: test.skip_test("Could not find 'sccs'; skipping test(s).\n") - test.subdir('SCCS', 'sub', ['sub', 'SCCS']) for f in ['aaa.in', 'bbb.in', 'ccc.in']: @@ -70,6 +80,7 @@ for f in ['ddd.in', 'eee.in', 'fff.in']: test.unlink(['sub', ','+f]) test.write(['SConstruct'], """ +SetOption('warn', 'deprecated-source-code') DefaultEnvironment()['SCCSCOM'] = 'cd ${TARGET.dir} && $SCCS get ${TARGET.file}' def cat(env, source, target): target = str(target[0]) @@ -92,7 +103,7 @@ test.write(['bbb.in'], "checked-out bbb.in\n") test.write(['sub', 'eee.in'], "checked-out sub/eee.in\n") sub_SConscript = os.path.join('sub', 'SConscript') -SConstruct_file_line = test.python_file_line(test.workpath('SConstruct'), 16)[:-1] +SConstruct_file_line = test.python_file_line(test.workpath('SConstruct'), 17)[:-1] expect = """\ @@ -136,7 +147,6 @@ test.must_not_be_writable(test.workpath('sub', 'ddd.in')) test.must_not_be_writable(test.workpath('sub', 'fff.in')) - test.pass_test() # Local Variables: |