diff options
| author | Daniel Moody <dmoody256@gmail.com> | 2017-12-22 08:23:42 (GMT) |
|---|---|---|
| committer | Daniel Moody <dmoody256@gmail.com> | 2017-12-22 08:23:42 (GMT) |
| commit | 843c4b571fdcc5da92987d867d25e207f985957f (patch) | |
| tree | 203a9ed630e8d2e882923b854f5ba028fdd8901a | |
| parent | 40f9ed571d45b7f5bc19e5ab3f4331bfea2626af (diff) | |
| parent | f542b2156cc423bb54e95aab857a2db858e93627 (diff) | |
| download | SCons-843c4b571fdcc5da92987d867d25e207f985957f.zip SCons-843c4b571fdcc5da92987d867d25e207f985957f.tar.gz SCons-843c4b571fdcc5da92987d867d25e207f985957f.tar.bz2 | |
Merge branch 'appveyor' of https://github.com/ajf58/scons into AppveyorCIScript
| -rw-r--r-- | .appveyor.yml | 27 | ||||
| -rw-r--r-- | README.rst | 4 | ||||
| -rwxr-xr-x | runtest.py | 21 |
3 files changed, 37 insertions, 15 deletions
diff --git a/.appveyor.yml b/.appveyor.yml new file mode 100644 index 0000000..d4b6624 --- /dev/null +++ b/.appveyor.yml @@ -0,0 +1,27 @@ +image: Visual Studio 2017 +shallow_clone: true + +environment: + matrix: + # Match the Python versions currently tested at http://buildbot.scons.org/#/, + # but include 32 and 64-bit variants. + - PYTHON: "C:\\Python27" + - PYTHON: "C:\\Python27-x64" + - PYTHON: "C:\\Python35" + - PYTHON: "C:\\Python35-x64" + - PYTHON: "C:\\Python36" + - PYTHON: "C:\\Python36-x64" + +install: + - "set PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%" + - python --version + - pip install lxml + - choco install dmd + - choco install ldc + - choco install swig + - choco install vswhere + +build: off + +test_script: + - cmd: python runtest.py -a -j 2 || if %errorlevel% == 2 then exit 0 else exit 1
\ No newline at end of file @@ -1,6 +1,10 @@ SCons - a software construction tool #################################### +.. image:: https://ci.appveyor.com/api/projects/status/github/ajf58/scons?svg=true + :target: https://ci.appveyor.com/project/ajf58/scons + :alt: AppVeyor CI Status + .. image:: https://img.shields.io/badge/IRC-scons-blue.svg :target: http://webchat.freenode.net/?channels=%23scons&uio=d4 :alt: IRC @@ -92,17 +92,11 @@ import stat import sys import time -try: - import threading - try: # python3 - from queue import Queue - except ImportError as e: # python2 - from Queue import Queue - threading_ok = True -except ImportError: - print("Can't import threading or queue") - threading_ok = False - +import threading +try: # python3 + from queue import Queue +except ImportError as e: # python2 + from Queue import Queue import subprocess @@ -864,7 +858,7 @@ class RunTest(threading.Thread): run_test(t, io_lock, True) self.queue.task_done() -if jobs > 1 and threading_ok: +if jobs > 1: print("Running tests using %d jobs"%jobs) # Start worker threads queue = Queue() @@ -878,9 +872,6 @@ if jobs > 1 and threading_ok: queue.put(t) queue.join() else: - # Run tests serially - if jobs > 1: - print("Ignoring -j%d option; no python threading module available."%jobs) for t in tests: run_test(t, None, False) |