Fix fifotest in light of tq API changes

diff --git a/test/fifotest.lua b/test/fifotest.lua
index 01fd78452ef006d515a0e33413b52cf185a98928..53048a21a31039bf386dc147f1fb915f87697ac5 100644 (file)
--- a/test/fifotest.lua
+++ b/test/fifotest.lua
@@ -1,20 +1,16 @@
-fmk = dofile("util/fifo.lua")
+fmk = dofile("fifo/fifo.lua")
 tmk = dofile("tq/tq.lua")
-tdiag = loadfile("tq/tq-diag.lua")()
+tdiag = dofile("tq/tq-diag.lua")
 
 f = fmk()
 t = tmk()
 
 ttime    = 0
-tfirearm = nil
-t.arm = function(_,fire,when) tfirearm = fire; print("t arm: ", when) end
+t.arm = function(_,when) print("t arm: ", when) end
 t.now = function(_) return ttime end
 function tfire(step)
   ttime = ttime + step*1000
-  if tfirearm
-   then print("t fire"); tfa = tfirearm; tfirearm = nil; tfa()
-   else print("t fizzle")
-  end
+  print("t fire"); t:fire()
 end
 
 function tqp(w,s) t:queue(w,print,s) end