Merge branch 'master' of github.com:m-labs/artiq

.travis.yml

@@ -16,7 +16,7 @@ before_install:
   - ./.travis/get-anaconda.sh
   - source $HOME/miniconda/bin/activate py34
   - sudo apt-get install --force-yes -y iverilog
-  - conda install pip coverage binstar migen cython conda-build jinja2
+  - conda install pip coverage binstar migen cython
   - pip install coveralls
 install:
   - conda build conda/artiq

.travis/get-anaconda.sh

@@ -6,5 +6,6 @@ hash -r
 conda config --set always_yes yes --set changeps1 no
 conda update -q conda
 conda info -a
+conda install conda-build jinja2
 conda create -q -n py34 python=$TRAVIS_PYTHON_VERSION
 conda config --add channels fallen

artiq/test/transforms.py

@@ -34,7 +34,11 @@ def run():
 optimize_out = """
 
 def run():
-    do_something(344)
+    now = syscall('now_init')
+    try:
+        do_something(344)
+    finally:
+        syscall('now_save', now)
 """