liminix

commit 9f03276db86ac660dd2b75a03429d2882fdb3379
parent 225fc6fe51940da23103d4136e490913953d3994
Author: Daniel Barlow <dan@telent.net>
Date:   Fri, 10 Mar 2023 18:41:43 +0000

move noise sources around in tests

wlan test shows output to make it easier to see when it went wrong

Diffstat:
M
ci.nix
 | 
2
+-
M
tests/wlan/test.nix
 | 
2
+-
M
tests/wlan/wait-for-wlan.expect
 | 
4
++--

3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ci.nix b/ci.nix
@@ -31,4 +31,4 @@ let
         liminix-config = vanilla;
       }).outputs.default;
     };
-in builtins.trace jobs jobs
+in jobs
diff --git a/tests/wlan/test.nix b/tests/wlan/test.nix
@@ -35,5 +35,5 @@ trap fatal ERR
 
 mkdir vm
 mips-vm --background ./vm ${img}/vmlinux ${img}/squashfs
-expect ${./wait-for-wlan.expect} > output && mv output $out
+expect ${./wait-for-wlan.expect} |tee output && mv output $out
 ''
diff --git a/tests/wlan/wait-for-wlan.expect b/tests/wlan/wait-for-wlan.expect
@@ -3,11 +3,11 @@ set timeout 60
 spawn socat unix-connect:vm/console -
 send "\r\n"
 expect "login:" {  send "root\r\n" }
-expect "/ #"
+expect "#"
 set FINISHED 0
 set EXIT "1"
 send "ls -l /run/uncaught-logs/current\r\n"
-expect "/ #"
+expect "#"
 while { $FINISHED < 10 } {
   send "grep AP-ENABLED /run/uncaught-logs/current || echo not\r\n"