From 4cd2634ba2181e40cac614f9214c3964256ad24a Mon Sep 17 00:00:00 2001 From: Michael Vasseur Date: Mon, 20 Nov 2023 17:18:52 +0100 Subject: [PATCH] Fix the first test first --- .github/jobs/configure-checks/all.bats | 55 +++++++++++++------------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/.github/jobs/configure-checks/all.bats b/.github/jobs/configure-checks/all.bats index d040a292fc0..bdddaa23089 100644 --- a/.github/jobs/configure-checks/all.bats +++ b/.github/jobs/configure-checks/all.bats @@ -431,33 +431,34 @@ compile_assertions_finished () { run make domserver assert_success run make judgehost + assert_line "SHOW OUTPUT" assert_success } -@test "Build domserver disabled" { - setup - run run_configure --disable-domserver - refute_line " * domserver...........: /opt/domjudge/domserver" - for group in www-data apache nginx; do - refute_line " * webserver group.....: $group" - done - assert_line " * judgehost...........: /opt/domjudge/judgehost" - assert_line " * runguard group......: domjudge-run" - run make domserver - assert_failure - run make judgehost - assert_success -} - -@test "Build judgehost disabled" { - setup - run run_configure --disable-judgehost - assert_line " * domserver...........: /opt/domjudge/domserver" - assert_regex "^ \* webserver group\.\.\.\.\.: (www-data|apache|nginx)$" - refute_line " * judgehost...........: /opt/domjudge/judgehost" - refute_line " * runguard group......: domjudge-run" - run make domserver - assert_success - run make judgehost - assert_failure -} +#@test "Build domserver disabled" { +# setup +# run run_configure --disable-domserver +# refute_line " * domserver...........: /opt/domjudge/domserver" +# for group in www-data apache nginx; do +# refute_line " * webserver group.....: $group" +# done +# assert_line " * judgehost...........: /opt/domjudge/judgehost" +# assert_line " * runguard group......: domjudge-run" +# run make domserver +# assert_failure +# run make judgehost +# assert_success +#} +# +#@test "Build judgehost disabled" { +# setup +# run run_configure --disable-judgehost +# assert_line " * domserver...........: /opt/domjudge/domserver" +# assert_regex "^ \* webserver group\.\.\.\.\.: (www-data|apache|nginx)$" +# refute_line " * judgehost...........: /opt/domjudge/judgehost" +# refute_line " * runguard group......: domjudge-run" +# run make domserver +# assert_success +# run make judgehost +# assert_failure +#}