diff --git a/.travis.yml b/.travis.yml index d6eae7023..8fa5ccfb1 100644 --- a/.travis.yml +++ b/.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 diff --git a/.travis/get-anaconda.sh b/.travis/get-anaconda.sh index 04e050441..9e746e616 100755 --- a/.travis/get-anaconda.sh +++ b/.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 diff --git a/artiq/test/transforms.py b/artiq/test/transforms.py index b9ee5e30d..e51995ad8 100644 --- a/artiq/test/transforms.py +++ b/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) """