Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/buildbot-config
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: caf951beeb58
Choose a base ref
...
head repository: m-labs/buildbot-config
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7967634161cb
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jan 30, 2017

  1. do not install Migen and MiSoC for Windows tests

    @sbourdeauducq
    sbourdeauducq committed Jan 30, 2017
    Copy the full SHA
    1b65b5f View commit details

  2. only run gateware simulations on Linux and exclude them from coverage

    @sbourdeauducq
    sbourdeauducq committed Jan 30, 2017
    Copy the full SHA
    7967634 View commit details
Showing with 8 additions and 6 deletions.
  1. +8 −6 master.cfg
14 changes: 8 additions & 6 deletions master.cfg
View file
Original file line number Diff line number Diff line change
@@ -294,11 +294,11 @@ def addCondaTeardownTestEnvironmentSteps(factory):
[conda_lock.access('exclusive')]))

def addPythonUnittestSteps(factory, locks=default_locks,
extra_vars={}):
extra_vars={}, source_path='.'):
factory.addStep(
ShellCommand(
name = 'python_unittest',
command = ['python', '-m', 'unittest', 'discover', '-v'],
command = ['python', '-m', 'unittest', 'discover', '-v', source_path],
description = 'testing',
descriptionDone = 'test',
haltOnFailure = True,
@@ -565,7 +565,9 @@ addCondaSetupTestEnvironmentSteps(artiqBuildFactory,
'migen', 'misoc'],
local_package=packageNameFromOutputName)
addPythonCoverageSteps(artiqBuildFactory,
source_path='artiq')
source_path='artiq/test')
addPythonUnittestSteps(artiqBuildFactory,
source_path='artiq/gateware/test')
addLitSteps(artiqBuildFactory,
test_path='artiq/test/lit',
extra_vars={ 'COVERAGE': '1', 'PYTHONPATH': '.' })
@@ -594,7 +596,7 @@ addARTIQFlashSteps(artiqBuildFactory,
'proxy', 'gateware', 'bios', 'runtime', 'start'],
address=test_board_hostname)
addPythonCoverageSteps(artiqBuildFactory,
source_path='artiq',
source_path='artiq/test',
locks=[low_latency_lock.access('exclusive')],
extra_vars={ 'ARTIQ_LOW_LATENCY': '1', 'ARTIQ_ROOT': 'artiq/examples/master' })
addPythonCoverageCombineSteps(artiqBuildFactory)
@@ -621,11 +623,11 @@ artiqWin64TestBuildFactory = BuildFactory()
addUpdateSteps(artiqWin64TestBuildFactory,
project='artiq')
addCondaSetupTestEnvironmentSteps(artiqWin64TestBuildFactory,
packages=['coverage', 'migen', 'misoc'])
packages=['coverage'])
addCondaInstallToTestEnvironmentSteps(artiqWin64TestBuildFactory,
packages=[WithProperties('%(package)s')])
addPythonCoverageSteps(artiqWin64TestBuildFactory,
source_path='artiq',
source_path='artiq/test',
locks=[low_latency_lock.access('exclusive')],
extra_vars={ 'ARTIQ_LOW_LATENCY': '1', 'ARTIQ_ROOT': 'artiq\\examples\\master' })
addPythonCoverageCombineSteps(artiqWin64TestBuildFactory)