From c225b42e49f594c294f91c1ecd344c2eca8a0bf3 Mon Sep 17 00:00:00 2001 From: patritzenfeld Date: Fri, 11 Oct 2024 09:34:49 +0200 Subject: [PATCH 1/2] Time out expect script sooner --- tasks/runGhci.expect | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tasks/runGhci.expect b/tasks/runGhci.expect index 8ce7226..04643e3 100644 --- a/tasks/runGhci.expect +++ b/tasks/runGhci.expect @@ -2,11 +2,13 @@ # GHC version to use set ver [lindex $argv 0]; - +set timeout 2 log_user 0 spawn ghci-$ver Global.hs TaskData.hs Description.hs Parse.hs -Wall -Wno-orphans log_user 1 +expect_before timeout { exit 1 } + expect "*" expect "Ok, four modules loaded.*" expect "ghci> " From 2f6ea4dd37e871a3826889b7bdedd279bc3c754f Mon Sep 17 00:00:00 2001 From: patritzenfeld Date: Fri, 11 Oct 2024 09:48:55 +0200 Subject: [PATCH 2/2] remove .hs file endings on load --- tasks/runGhci.expect | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/runGhci.expect b/tasks/runGhci.expect index 04643e3..b21b719 100644 --- a/tasks/runGhci.expect +++ b/tasks/runGhci.expect @@ -5,7 +5,7 @@ set ver [lindex $argv 0]; set timeout 2 log_user 0 -spawn ghci-$ver Global.hs TaskData.hs Description.hs Parse.hs -Wall -Wno-orphans +spawn ghci-$ver Global TaskData Description Parse -Wall -Wno-orphans log_user 1 expect_before timeout { exit 1 }