fix 7967634

sbourdeauducq · sbourdeauducq · commit f2e1f060a24a · 2017-01-30T10:14:58.000+08:00
diff --git a/master.cfg b/master.cfg
@@ -294,11 +294,11 @@ def addCondaTeardownTestEnvironmentSteps(factory):
                                 [conda_lock.access('exclusive')]))
 
 def addPythonUnittestSteps(factory, locks=default_locks,
-                           extra_vars={}, source_path='.'):
+                           extra_vars={}, test_path='.'):
     factory.addStep(
         ShellCommand(
             name              = 'python_unittest',
-            command           = ['python', '-m', 'unittest', 'discover', '-v', source_path],
+            command           = ['python', '-m', 'unittest', 'discover', '-v', test_path],
             description       = 'testing',
             descriptionDone   = 'test',
             haltOnFailure     = True,
@@ -307,13 +307,13 @@ def addPythonUnittestSteps(factory, locks=default_locks,
             locks             = locks))
 
 def addPythonCoverageSteps(factory, source_path, locks=default_locks,
-                           extra_vars={}):
+                           extra_vars={}), test_path='.'):
     factory.addStep(
         ShellCommand(
             name              = 'python_unittest',
             command           = ['coverage', 'run', '--parallel-mode',
                                  '--source', source_path,
-                                 '-m', 'unittest', 'discover', '-v'],
+                                 '-m', 'unittest', 'discover', '-v', test_path],
             description       = 'testing',
             descriptionDone   = 'test',
             descriptionSuffix = 'unittest',
@@ -565,9 +565,9 @@ addCondaSetupTestEnvironmentSteps(artiqBuildFactory,
               'migen', 'misoc'],
     local_package=packageNameFromOutputName)
 addPythonCoverageSteps(artiqBuildFactory,
-    source_path='artiq/test')
+    source_path='artiq', test_path='artiq/test')
 addPythonUnittestSteps(artiqBuildFactory,
-    source_path='artiq/gateware/test')
+    test_path='artiq/gateware/test')
 addLitSteps(artiqBuildFactory,
     test_path='artiq/test/lit',
     extra_vars={ 'COVERAGE': '1', 'PYTHONPATH': '.' })
@@ -596,7 +596,7 @@ addARTIQFlashSteps(artiqBuildFactory,
              'proxy', 'gateware', 'bios', 'runtime', 'start'],
     address=test_board_hostname)
 addPythonCoverageSteps(artiqBuildFactory,
-    source_path='artiq/test',
+    source_path='artiq', test_path='artiq/test',
     locks=[low_latency_lock.access('exclusive')],
     extra_vars={ 'ARTIQ_LOW_LATENCY': '1', 'ARTIQ_ROOT': 'artiq/examples/master' })
 addPythonCoverageCombineSteps(artiqBuildFactory)
@@ -627,7 +627,7 @@ addCondaSetupTestEnvironmentSteps(artiqWin64TestBuildFactory,
 addCondaInstallToTestEnvironmentSteps(artiqWin64TestBuildFactory,
     packages=[WithProperties('%(package)s')])
 addPythonCoverageSteps(artiqWin64TestBuildFactory,
-    source_path='artiq/test',
+    source_path='artiq', test_path='artiq/test',
     locks=[low_latency_lock.access('exclusive')],
     extra_vars={ 'ARTIQ_LOW_LATENCY': '1', 'ARTIQ_ROOT': 'artiq\\examples\\master' })
 addPythonCoverageCombineSteps(artiqWin64TestBuildFactory)
