From 6bfed9fc7d3fcb9e468f61fd1ab88ad4825241a1 Mon Sep 17 00:00:00 2001 From: stevenknight Date: Mon, 2 Aug 2004 01:22:26 +0000 Subject: [PATCH] Restore some test files as Aegis tests. Add a packaging test to make sure test files are marked as Aegis tests in the future. git-svn-id: http://scons.tigris.org/svn/scons/trunk@1020 fdb21ef1-2011-0410-befe-b5e4ea1792b1 --- src/engine/SCons/WarningsTests.py | 5 +- src/test_aegistests.py | 77 +++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 src/test_aegistests.py diff --git a/src/engine/SCons/WarningsTests.py b/src/engine/SCons/WarningsTests.py index 1016fdbe..38fa0f55 100644 --- a/src/engine/SCons/WarningsTests.py +++ b/src/engine/SCons/WarningsTests.py @@ -29,7 +29,10 @@ import SCons.Warnings class TestOutput: def __call__(self, x): - self.out = str(x) + args = x[0] + if len(args) == 1: + args = args[0] + self.out = str(args) class WarningsTestCase(unittest.TestCase): def test_Warning(self): diff --git a/src/test_aegistests.py b/src/test_aegistests.py new file mode 100644 index 00000000..9d0be226 --- /dev/null +++ b/src/test_aegistests.py @@ -0,0 +1,77 @@ +#!/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__" + +""" +Verify that we have proper Copyright notices on all the right files +in our distributions. + +Note that this is a packaging test, not a functional test, so the +name of this script doesn't end in *Tests.py. +""" + +import os +import popen2 +import re +import string +import sys + +import TestSCons + +test = TestSCons.TestSCons() + +try: + popen2.Popen3 +except AttributeError: + def get_stdout(command): + (tochild, fromchild, childerr) = os.popen3(command) + tochild.close() + return fromchild.read() +else: + def get_stdout(command): + p = popen2.Popen3(command, 1) + p.tochild.close() + return p.fromchild.read() + +output = get_stdout('aegis -list -unformatted pf') +\ + get_stdout('aegis -list -unformatted cf') +lines = string.split(output, '\n')[:-1] +sources = filter(lambda x: x[:7] == 'source ', lines) + +re1 = re.compile(r' src/.*Tests\.py') +re2 = re.compile(r' src/test_.*\.py') +re3 = re.compile(r' test/.*\.py') + +def filename_is_a_test(x): + return re1.search(x) or re2.search(x) or re3.search(x) + +test_files = filter(filename_is_a_test, sources) + +if test_files: + sys.stderr.write("Found the following files with test names not marked as Aegis tests:\n") + sys.stderr.write('\t' + string.join(test_files, '\n\t') + '\n') + test.fail_test(1) + +test.pass_test() -- 2.26.2