From 7a7fe24a9bdc1089024ac889697b0e65d8426348 Mon Sep 17 00:00:00 2001 From: anatoly techtonik Date: Thu, 6 Mar 2014 15:35:56 +0300 Subject: runtest.py: Rewrite module description --- runtest.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/runtest.py b/runtest.py index 2b7f7ce..a5c55fa 100755 --- a/runtest.py +++ b/runtest.py @@ -4,18 +4,17 @@ # # runtest.py - wrapper script for running SCons tests # -# This script mainly exists to set PYTHONPATH to the right list of -# directories to test the SCons modules. +# SCons test suite consists of: # -# By default, it directly uses the modules in the local tree: -# ./src/ (source files we ship) and ./QMTest/ (other modules we don't). +# - unit tests - included in *Tests.py files from src/ dir +# - module tests - are in test/ dir and use framework from QMTest/ # -# When any -p option is specified, this script assumes it's in a -# directory in which a build has been performed, and sets PYTHONPATH -# so that it *only* references the modules that have unpacked from -# the specified built package, to test whether the packages are good. +# This script adds src/ and QMTest/ directories to PYTHONPATH, +# performs test discovery and processes them according to options. # -# Options: +# With -p (--package) option, script tests specified package from +# build directory and sets PYTHONPATH to reference modules unpacked +# during build process for testing purposes (build/test-*). # # -3 Run with the python -3 option, # -- cgit v0.12 From a083934a11bc09b409842c38fe12bd454b9a430c Mon Sep 17 00:00:00 2001 From: anatoly techtonik Date: Thu, 6 Mar 2014 15:51:31 +0300 Subject: runtest.py: Remove qmtest support --- runtest.py | 74 +++----------------------------------------------------------- 1 file changed, 3 insertions(+), 71 deletions(-) diff --git a/runtest.py b/runtest.py index a5c55fa..2e34969 100755 --- a/runtest.py +++ b/runtest.py @@ -20,8 +20,7 @@ # # -a Run all tests; does a virtual 'find' for # all SCons tests under the current directory. -# You can also specify a list of subdirectories -# (not available with the "--qmtest" option!). Then, +# You can also specify a list of subdirectories. Then, # only the given folders are searched for test files. # # -d Debug. Runs the script under the Python @@ -114,7 +113,6 @@ print_passed_summary = None python3incompatibilities = None scons = None scons_exec = None -qmtest = None testlistfile = None version = '' print_times = None @@ -158,7 +156,6 @@ Options: tar-gz .tar.gz distribution zip .zip distribution --passed Summarize which tests passed. - --qmtest Run using the QMTest harness (deprecated). -q, --quiet Don't print the test being executed. --quit-on-failure Quit on any test failure -s, --short-progress Short progress, prints only the command line @@ -216,7 +213,7 @@ opts, args = getopt.getopt(args, "3b:def:hj:klnP:p:qsv:Xx:t", 'debug', 'external', 'file=', 'help', 'no-progress', 'jobs=', 'list', 'no-exec', 'nopipefiles', - 'package=', 'passed', 'python=', 'qmtest', + 'package=', 'passed', 'python=', 'quiet', 'quit-on-failure', 'short-progress', 'time', @@ -263,12 +260,6 @@ for o, a in opts: print_passed_summary = 1 elif o in ['-P', '--python']: python = a - elif o in ['--qmtest']: - if sys.platform == 'win32': - # typically in c:/PythonXX/Scripts - qmtest = 'qmtest.py' - else: - qmtest = 'qmtest' elif o in ['-q', '--quiet']: printcommand = 0 suppress_stdout = True @@ -572,15 +563,6 @@ else: if not baseline or baseline == '.': base = cwd elif baseline == '-': - # Tentative code for fetching information directly from the - # QMTest context file. - # - #import qm.common - #import qm.test.context - #qm.rc.Load("test") - #context = qm.test.context.Context() - #context.Read('context') - url = None svn_info = os.popen("svn info 2>&1", "r").read() match = re.search('URL: (.*)', svn_info) @@ -706,7 +688,7 @@ elif testlistfile: tests = [x for x in tests if x[0] != '#'] tests = [x[:-1] for x in tests] tests = [x.strip() for x in tests] -elif options.all and not qmtest: +elif options.all: # Find all of the SCons functional tests in the local directory # tree. This is anything under the 'src' subdirectory that ends # with 'Tests.py', or any Python script (*.py) under the 'test' @@ -728,56 +710,6 @@ runtest.py: No tests were found. """) sys.exit(1) -if qmtest: - if baseline: - aegis_result_stream = 'scons_tdb.AegisBaselineStream' - qmr_file = 'baseline.qmr' - else: - aegis_result_stream = 'scons_tdb.AegisChangeStream' - qmr_file = 'results.qmr' - - if print_times: - aegis_result_stream = aegis_result_stream + "(print_time='1')" - - qmtest_args = [ qmtest, ] - - qmtest_args.extend([ - 'run', - '--output %s' % qmr_file, - '--format none', - '--result-stream="%s"' % aegis_result_stream, - ]) - - if python: - qmtest_args.append('--context python="%s"' % python) - - if options.xml: - rsclass = 'scons_tdb.SConsXMLResultStream' - qof = "r'" + options.xml + "'" - rs = '--result-stream="%s(filename=%s)"' % (rsclass, qof) - qmtest_args.append(rs) - - os.environ['SCONS'] = os.path.join(cwd, 'src', 'script', 'scons.py') - - cmd = ' '.join(qmtest_args + tests) - if printcommand: - sys.stdout.write(cmd + '\n') - sys.stdout.flush() - status = 0 - if execute_tests: - status = os.system(cmd) - try: - wexitstatus = os.WEXITSTATUS - except AttributeError: - pass - else: - status = wexitstatus(status) - sys.exit(status) - -#try: -# os.chdir(scons_script_dir) -#except OSError: -# pass tests = [Test(t) for t in tests] -- cgit v0.12 From 31bc313b3447cc9b093a32be1aca6c23471967df Mon Sep 17 00:00:00 2001 From: anatoly techtonik Date: Thu, 6 Mar 2014 18:02:59 +0300 Subject: Update CHANGES.txt --- src/CHANGES.txt | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 52d8604..b66dd63 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -4,7 +4,14 @@ Change Log -RELEASE 2.3.1.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE + +RELEASE 2.3.2.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE + + From Anatoly Techtonik: + - Remove support for QMTest harness from runtest.py + + +RELEASE 2.3.1 - Mon, 02 Mar 2014 13:53:45 -0400 From Andrew Featherstone: - Added support for EPUB output format to the DocBook tool. @@ -85,6 +92,7 @@ RELEASE 2.3.1.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE - Fixed description of ignore_case for EnumVariable in the MAN page (#2774). + RELEASE 2.3.0 - Mon, 02 Mar 2013 13:22:29 -0400 From Anatoly Techtonik: @@ -148,6 +156,7 @@ RELEASE 2.3.0 - Mon, 02 Mar 2013 13:22:29 -0400 Add builder InstallVersionedLib to create the required symlinks installing a versioned shared library. + RELEASE 2.2.0 - Mon, 05 Aug 2012 15:37:48 +0000 From dubcanada on Bitbucket: -- cgit v0.12