From ad09b3c28f6bf4b3057a4384131fac8eff33498b Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 25 Sep 2022 13:44:28 +0300 Subject: [PATCH 43/43] CI: Run freeciv executables with '-F' See osdn #45582 Signed-off-by: Marko Lindqvist --- scripts/ci-build.sh | 2 +- tests/rs_test_res/ruleset_loads.sh.in | 2 +- tests/rulesets_save.sh.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/ci-build.sh b/scripts/ci-build.sh index 850eb2fcd0..596d9860b0 100755 --- a/scripts/ci-build.sh +++ b/scripts/ci-build.sh @@ -178,7 +178,7 @@ echo "Checking ruleset auto help generation" echo "Running Freeciv server autogame" cd ${HOME}/freeciv/default/bin/ -./freeciv-server --Announce none -e --read ${basedir}/scripts/test-autogame.serv +./freeciv-server --Announce none -e -F --read ${basedir}/scripts/test-autogame.serv echo "Freeciv server autogame successful!" ;; diff --git a/tests/rs_test_res/ruleset_loads.sh.in b/tests/rs_test_res/ruleset_loads.sh.in index be6c1c92d8..c4a52ab01a 100644 --- a/tests/rs_test_res/ruleset_loads.sh.in +++ b/tests/rs_test_res/ruleset_loads.sh.in @@ -6,7 +6,7 @@ (echo "lua unsafe-file @abs_top_srcdir@/tests/rs_test_res/ruleset_is.lua" \ | (EXPECTED_RULESET=$1 @abs_top_builddir@/fcser \ - --Announce none --ruleset $1)) \ + -F --Announce none --ruleset $1)) \ || exit 1 # The ruleset was able to load. diff --git a/tests/rulesets_save.sh.in b/tests/rulesets_save.sh.in index 78a10e1bd1..1290e5d0ee 100644 --- a/tests/rulesets_save.sh.in +++ b/tests/rulesets_save.sh.in @@ -50,7 +50,7 @@ for ruleset in $rulesets; do echo "Checking ruleset saving stability for $ruleset" echo "Resaving resaved $ruleset" - FREECIV_DATA_PATH=$tmpdir @abs_top_builddir@/fcruleup -c -r "$resaved" \ + FREECIV_DATA_PATH=$tmpdir @abs_top_builddir@/fcruleup -F -c -r "$resaved" \ --output "$reresaved_path" \ || exit 1 if [ ! -d "$reresaved_path" ] ; then -- 2.35.1