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/artiq
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c8dc6ca07c12
Choose a base ref
...
head repository: m-labs/artiq
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e51928ee9744
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jun 29, 2016

  1. coredevice/core: add syscall type annotation

    @sbourdeauducq
    sbourdeauducq committed Jun 29, 2016
    Copy the full SHA
    c6e54e3 View commit details

  2. test/rtio: adapt to new handover behavior

    @sbourdeauducq
    sbourdeauducq committed Jun 29, 2016
    Copy the full SHA
    e51928e View commit details
Showing with 2 additions and 3 deletions.
  1. +1 −1 artiq/coredevice/core.py
  2. +1 −2 artiq/test/coredevice/test_rtio.py
2 changes: 1 addition & 1 deletion artiq/coredevice/core.py
View file
Original file line number Diff line number Diff line change
@@ -38,7 +38,7 @@ def __str__(self):


@syscall
def rtio_init():
def rtio_init() -> TNone:
raise NotImplementedError("syscall not simulated")

@syscall(flags={"nounwind", "nowrite"})
3 changes: 1 addition & 2 deletions artiq/test/coredevice/test_rtio.py
View file
Original file line number Diff line number Diff line change
@@ -231,6 +231,7 @@ def build(self):

@kernel
def run(self):
self.core.reset()
self.set_dataset("time_at_start", now_mu())


@@ -334,8 +335,6 @@ def test_watchdog(self):
def test_time_keeps_running(self):
self.execute(TimeKeepsRunning)
t1 = self.dataset_mgr.get("time_at_start")

self.device_mgr.get("comm").close() # start a new session
self.execute(TimeKeepsRunning)
t2 = self.dataset_mgr.get("time_at_start")