diff --git a/ci.nix b/ci.nix index 7017e9c..1862047 100644 --- 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 index b5f0682..ebe6470 100644 --- 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 index d3b8576..0bfd584 100644 --- 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"