liminix

commit 0787807a7f8374587be83decda31ab1bc8cb203f
parent 38ed91f641a1fb309b899ec58db35a484449ae9f
Author: Daniel Barlow <dan@telent.net>
Date:   Tue,  5 Mar 2024 17:56:59 +0000

ifwait: don't run on load if in test harness

Diffstat:
M
pkgs/ifwait/ifwait.fnl
 | 
23
++++++++++++++---------
M
pkgs/ifwait/test-ifwait.fnl
 | 
6
++++--

2 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/pkgs/ifwait/ifwait.fnl b/pkgs/ifwait/ifwait.fnl
@@ -33,12 +33,17 @@
     (when (. got params.expecting)
       (os.exit 0))))
 
-(let [parameters
-      (assert (parse-args arg)
-              (.. "Usage: " (. arg 0) " [-v] ifname [present|up|running]"))]
-  (when parameters.verbose
-    (print (.. (. arg 0) ": waiting for "
-               parameters.link " to be " parameters.expecting)))
-
-  (each [event (nl.events {:link true})]
-    (run-event parameters event)))
+(fn run []
+  (let [parameters
+        (assert (parse-args arg)
+                (.. "Usage: " (. arg 0) " [-v] ifname [present|up|running]"))]
+    (when parameters.verbose
+      (print (.. (. arg 0) ": waiting for "
+                 parameters.link " to be " parameters.expecting)))
+
+    (each [event (nl.events {:link true})]
+      (run-event parameters event))))
+
+(when (not (= (. arg 0) "test")) (run))
+
+{ : run  }
diff --git a/pkgs/ifwait/test-ifwait.fnl b/pkgs/ifwait/test-ifwait.fnl
@@ -11,6 +11,8 @@
 
 (tset package.loaded :anoia.nl { :events events })
 
-(set _G.arg (doto  ["-v" "dummy0" "up"] (tset 0 "ifwait")))
+(set _G.arg (doto  ["-v" "dummy0" "up"] (tset 0 "test")))
 
-(fennel.dofile "ifwait.fnl" { :correlate true })
+(local ifwait (require :ifwait))
+
+(ifwait.run)