diff options
| author | anatoly techtonik <techtonik@gmail.com> | 2012-12-20 23:02:57 (GMT) |
|---|---|---|
| committer | anatoly techtonik <techtonik@gmail.com> | 2012-12-20 23:02:57 (GMT) |
| commit | 61c8eaffe989844ed2b54f458001685f3144dcd5 (patch) | |
| tree | 07ebe91bd7183ff4a8bb0c96c5ef81cb4b12faa7 | |
| parent | 0a22fde40fc0e458ce0a6d4010b54c91595fb4bf (diff) | |
| download | SCons-61c8eaffe989844ed2b54f458001685f3144dcd5.zip SCons-61c8eaffe989844ed2b54f458001685f3144dcd5.tar.gz SCons-61c8eaffe989844ed2b54f458001685f3144dcd5.tar.bz2 | |
Fix tests broken after --noqmtest option was removed from runtest.py
| -rw-r--r-- | bin/calibrate.py | 2 | ||||
| -rw-r--r-- | test/runtest/noqmtest.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/bin/calibrate.py b/bin/calibrate.py index 72a6ac7..8ed2ece 100644 --- a/bin/calibrate.py +++ b/bin/calibrate.py @@ -50,7 +50,7 @@ def main(argv=None): if len(args) > 1: print arg + ':' - command = [sys.executable, 'runtest.py', '--noqmtest'] + command = [sys.executable, 'runtest.py'] if opts.package: command.extend(['-p', opts.package]) command.append(arg) diff --git a/test/runtest/noqmtest.py b/test/runtest/noqmtest.py index eb33223..cea2f11 100644 --- a/test/runtest/noqmtest.py +++ b/test/runtest/noqmtest.py @@ -25,7 +25,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" """ -Test that the --noqmtest option invokes tests directly via Python, not +Test that by default tests are invoked directly via Python, not using qmtest. """ @@ -74,7 +74,7 @@ testlist = [ test_pass_py, ] -test.run(arguments = '-k --noqmtest %s' % ' '.join(testlist), +test.run(arguments = '-k %s' % ' '.join(testlist), status = 1, stdout = expect_stdout, stderr = expect_stderr) |