From 37b80247f15780be9aa00bfeb4a2a0b8a3882720 Mon Sep 17 00:00:00 2001
From: whitequark <whitequark@whitequark.org>
Date: Tue, 24 Nov 2015 00:20:00 +0800
Subject: [PATCH] lit-test: fix breakage from abb36b4 and 02f2763.

---
 lit-test/test/iodelay/call.py             |  4 ++--
 lit-test/test/iodelay/class.py            |  2 +-
 lit-test/test/iodelay/linear.py           |  8 ++++----
 lit-test/test/iodelay/loop.py             |  8 ++++----
 lit-test/test/iodelay/order_invariance.py |  4 ++--
 lit-test/test/iodelay/range.py            | 12 ++++++------
 lit-test/test/iodelay/return.py           |  4 ++--
 7 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/lit-test/test/iodelay/call.py b/lit-test/test/iodelay/call.py
index 65580812a..e08446da1 100644
--- a/lit-test/test/iodelay/call.py
+++ b/lit-test/test/iodelay/call.py
@@ -2,9 +2,9 @@
 # RUN: OutputCheck %s --file-to-check=%t
 
 def f():
-    delay(1.0)
+    delay_mu(1)
 
-# CHECK-L: g: ()->NoneType delay(s->mu(2.0) mu)
+# CHECK-L: g: ()->NoneType delay(2 mu)
 def g():
     f()
     f()
diff --git a/lit-test/test/iodelay/class.py b/lit-test/test/iodelay/class.py
index 61ca122f8..6bcb9339b 100644
--- a/lit-test/test/iodelay/class.py
+++ b/lit-test/test/iodelay/class.py
@@ -1,7 +1,7 @@
 # RUN: %python -m artiq.compiler.testbench.signature %s >%t
 # RUN: OutputCheck %s --file-to-check=%t
 
-# CHECK-L: g: (i:<instance c {}>)->NoneType delay(s->mu(1.0) mu)
+# CHECK-L: g: (i:<instance c {}>)->NoneType delay(1000000 mu)
 def g(i):
     i.f(1.0)
 
diff --git a/lit-test/test/iodelay/linear.py b/lit-test/test/iodelay/linear.py
index 7037516f6..cb2bed204 100644
--- a/lit-test/test/iodelay/linear.py
+++ b/lit-test/test/iodelay/linear.py
@@ -1,12 +1,12 @@
 # RUN: %python -m artiq.compiler.testbench.signature %s >%t
 # RUN: OutputCheck %s --file-to-check=%t
 
-# CHECK-L: f: ()->NoneType delay(s->mu(1.0) + 1000 mu)
+# CHECK-L: f: ()->NoneType delay(1001000 mu)
 def f():
     delay(1.0)
     delay_mu(1000)
 
-# CHECK-L: g: ()->NoneType delay(s->mu(5.0) mu)
+# CHECK-L: g: ()->NoneType delay(3 mu)
 def g():
-    delay(1.0)
-    delay(2.0 * 2)
+    delay_mu(1)
+    delay_mu(2)
diff --git a/lit-test/test/iodelay/loop.py b/lit-test/test/iodelay/loop.py
index 228756224..37bcb9e07 100644
--- a/lit-test/test/iodelay/loop.py
+++ b/lit-test/test/iodelay/loop.py
@@ -1,13 +1,13 @@
 # RUN: %python -m artiq.compiler.testbench.signature %s >%t
 # RUN: OutputCheck %s --file-to-check=%t
 
-# CHECK-L: f: ()->NoneType delay(s->mu(1.5) * 10 mu)
+# CHECK-L: f: ()->NoneType delay(30 mu)
 def f():
     for _ in range(10):
-        delay(1.5)
+        delay_mu(3)
 
-# CHECK-L: g: ()->NoneType delay(s->mu(1.5) * 2 * 10 mu)
+# CHECK-L: g: ()->NoneType delay(60 mu)
 def g():
     for _ in range(10):
         for _ in range(2):
-            delay(1.5)
+            delay_mu(3)
diff --git a/lit-test/test/iodelay/order_invariance.py b/lit-test/test/iodelay/order_invariance.py
index af5adf13c..e4deb96c5 100644
--- a/lit-test/test/iodelay/order_invariance.py
+++ b/lit-test/test/iodelay/order_invariance.py
@@ -1,10 +1,10 @@
 # RUN: %python -m artiq.compiler.testbench.signature %s >%t
 # RUN: OutputCheck %s --file-to-check=%t
 
-# CHECK-L: g: ()->NoneType delay(s->mu(2.0) mu)
+# CHECK-L: g: ()->NoneType delay(2 mu)
 def g():
     f()
     f()
 
 def f():
-    delay(1.0)
+    delay_mu(1)
diff --git a/lit-test/test/iodelay/range.py b/lit-test/test/iodelay/range.py
index 498ee6eb5..9c4a73a79 100644
--- a/lit-test/test/iodelay/range.py
+++ b/lit-test/test/iodelay/range.py
@@ -1,20 +1,20 @@
 # RUN: %python -m artiq.compiler.testbench.signature %s >%t
 # RUN: OutputCheck %s --file-to-check=%t
 
-# CHECK-L: f: (a:int(width=32))->NoneType delay(s->mu(1.5) * a mu)
+# CHECK-L: f: (a:int(width=32))->NoneType delay(3 * a mu)
 def f(a):
     for _ in range(a):
-        delay(1.5)
+        delay_mu(3)
 
-# CHECK-L: g: (a:int(width=32), b:int(width=32))->NoneType delay(s->mu(1.5) * (b - a) mu)
+# CHECK-L: g: (a:int(width=32), b:int(width=32))->NoneType delay(3 * (b - a) mu)
 def g(a, b):
     for _ in range(a, b):
-        delay(1.5)
+        delay_mu(3)
 
-# CHECK-L: h: (a:int(width=32), b:int(width=32), c:int(width=32))->NoneType delay(s->mu(1.5) * (b - a) // c mu)
+# CHECK-L: h: (a:int(width=32), b:int(width=32), c:int(width=32))->NoneType delay(3 * (b - a) // c mu)
 def h(a, b, c):
     for _ in range(a, b, c):
-        delay(1.5)
+        delay_mu(3)
 
 f(1)
 g(1,2)
diff --git a/lit-test/test/iodelay/return.py b/lit-test/test/iodelay/return.py
index 64398dfc4..d07267a44 100644
--- a/lit-test/test/iodelay/return.py
+++ b/lit-test/test/iodelay/return.py
@@ -1,10 +1,10 @@
 # RUN: %python -m artiq.compiler.testbench.signature %s >%t
 # RUN: OutputCheck %s --file-to-check=%t
 
-# CHECK-L: f: ()->int(width=32) delay(s->mu(1.5) * 10 mu)
+# CHECK-L: f: ()->int(width=32) delay(30 mu)
 def f():
     for _ in range(10):
-        delay(1.5)
+        delay_mu(3)
     return 10
 
 # CHECK-L: g: (x:float)->int(width=32)