From 0eae25cae7a5c6e291af7f0c81047785ec92c55c Mon Sep 17 00:00:00 2001 From: whitequark Date: Sat, 2 Apr 2016 09:53:56 +0000 Subject: [PATCH 1/2] Revert "conda: simplify llvmlite-artiq version requirement" This reverts commit 4d54695863f1689cd59537791076397778581d9f. --- conda/artiq/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/artiq/meta.yaml b/conda/artiq/meta.yaml index a04c82c13..1ca39e0a9 100644 --- a/conda/artiq/meta.yaml +++ b/conda/artiq/meta.yaml @@ -37,7 +37,7 @@ requirements: - binutils-or1k-linux run: - python >=3.5.1 - - llvmlite-artiq 0.5.1 + - llvmlite-artiq 0.5.1 py35_17 - scipy - numpy - prettytable From 3e6e8c6b5106b1fbc3d660e99cf5baf0eb031c47 Mon Sep 17 00:00:00 2001 From: whitequark Date: Sat, 2 Apr 2016 09:54:35 +0000 Subject: [PATCH 2/2] Revert "test: XFAIL lit/devirtualization/*." This reverts commit 63121e4faf72bda3d8d7b0728851cb0c0f5d2705. --- artiq/test/lit/devirtualization/function.py | 1 - artiq/test/lit/devirtualization/method.py | 1 - 2 files changed, 2 deletions(-) diff --git a/artiq/test/lit/devirtualization/function.py b/artiq/test/lit/devirtualization/function.py index c8fe65691..db2e7afd0 100644 --- a/artiq/test/lit/devirtualization/function.py +++ b/artiq/test/lit/devirtualization/function.py @@ -1,6 +1,5 @@ # RUN: env ARTIQ_DUMP_IR=%t %python -m artiq.compiler.testbench.embedding +compile %s # RUN: OutputCheck %s --file-to-check=%t.txt -# XFAIL: * from artiq.language.core import * from artiq.language.types import * diff --git a/artiq/test/lit/devirtualization/method.py b/artiq/test/lit/devirtualization/method.py index 8c258a41b..32578d599 100644 --- a/artiq/test/lit/devirtualization/method.py +++ b/artiq/test/lit/devirtualization/method.py @@ -1,6 +1,5 @@ # RUN: env ARTIQ_DUMP_IR=%t %python -m artiq.compiler.testbench.embedding +compile %s 2>%t # RUN: OutputCheck %s --file-to-check=%t.txt -# XFAIL: * from artiq.language.core import * from artiq.language.types import *