From 852bc9b4c9f4f9da0fb7c4745e5e79f086a05e9e Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 22 Jun 2025 09:32:16 +0300 Subject: [PATCH 82/82] Drop rulesets_not_broken.sh.in See RM #1532 Signed-off-by: Marko Lindqvist --- configure.ac | 2 -- tests/.gitignore | 1 - tests/Makefile.am | 1 - tests/rulesets_not_broken.sh.in | 42 --------------------------------- 4 files changed, 46 deletions(-) delete mode 100644 tests/rulesets_not_broken.sh.in diff --git a/configure.ac b/configure.ac index cab0443918..0e2b3e6cd9 100644 --- a/configure.ac +++ b/configure.ac @@ -2006,8 +2006,6 @@ AC_CONFIG_FILES([fcruleup:bootstrap/fcruleup.in], [chmod +x fcruleup]) if test "x$ruledit" = "xyes" ; then AC_CONFIG_FILES([fcruledit:bootstrap/fcruledit.in], [chmod +x fcruledit]) fi -AC_CONFIG_FILES([tests/rulesets_not_broken.sh], - [chmod +x tests/rulesets_not_broken.sh]) AC_CONFIG_FILES([tests/rulesets_save.sh], [chmod +x tests/rulesets_save.sh]) AC_CONFIG_FILES([tests/rulesets_upgrade.sh], diff --git a/tests/.gitignore b/tests/.gitignore index 8e2eaf0ad0..1e99c6cbfa 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -1,6 +1,5 @@ /Makefile.in /check-output -/rulesets_not_broken.sh /rulesets_save.sh /rulesets_upgrade.sh /rulesets_autohelp.sh diff --git a/tests/Makefile.am b/tests/Makefile.am index b80003e0b7..69b4603dcb 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -14,7 +14,6 @@ EXTRA_DIST = check_macros.sh \ generate_rs_not_broken.sh \ generate_rs_save.sh \ header_guard.sh \ - rulesets_not_broken.sh.in \ rulesets_save.sh.in \ rulesets_upgrade.sh.in \ rs_test_res/ruleset_is.lua \ diff --git a/tests/rulesets_not_broken.sh.in b/tests/rulesets_not_broken.sh.in deleted file mode 100644 index caa50f0171..0000000000 --- a/tests/rulesets_not_broken.sh.in +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env bash -#/*********************************************************************** -# Freeciv - Copyright (C) 2017-2023 -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -#***********************************************************************/ - -# rulesets_not_broken.sh [ruleset]... -# Exits with 0 when each specified ruleset or, if no rulesets are specified, -# each ruleset that is developed with Freeciv, are able to load. Exits with -# 1 if any ruleset fails to load. - -if test "$1" = "" ; then - # Try to load all rulesets that are developed with Freeciv - rulesets="$(cat @abs_top_srcdir@/tests/rs_test_res/ruleset_list_dist.txt)" - optional="$(cat @abs_top_srcdir@/tests/rs_test_res/ruleset_list_opt.txt)" - for opt in $optional ; do - if test -d "@abs_top_srcdir@/data/$opt" ; then - rulesets="$rulesets $opt" - fi - done -else - # Try to load the specified ruleset(s) - rulesets=$@ -fi - -for ruleset in $rulesets; do - echo "Loading $ruleset" - @abs_top_builddir@/tests/rs_test_res/ruleset_loads.sh $ruleset || exit 1 -done - -echo "No broken rulesets detected." - -exit 0 -- 2.47.2