4 files changed, 55 insertions, 94 deletions
diff --git a/contrib/bc/tests/dc/scripts/easter.dc b/contrib/bc/tests/dc/scripts/easter.dc
new file mode 100644
index 000000000000..e2c126ba1129
--- /dev/null
+++ b/contrib/bc/tests/dc/scripts/easter.dc
@@ -0,0 +1,49 @@
+#! /usr/bin/dc
+
+# This is the actual script.
+[
+	ddsf
+	[
+		lfp
+		[too early
+		]P
+		q
+	]s@
+	1583>@
+	ddd19%1+sg100/1+d3*4/12-sx8*5+25/5-sz5*4/lx-10-sdlg11*20+lz+lx-30%
+	d
+	[30+]s@
+	0>@d
+	[
+		[1+]s@
+		lg11<@
+	]s@
+	25=@d
+	[1+]s@
+	24=@se44le-d
+	[30+]s@
+	21>@dld+7%-7+
+	[March ]sm
+	d
+	[
+		31-
+		[April ]sm
+	]s@
+	31<@dn32PsnlmPdnsn1z>p
+	10P
+]sp
+
+2021
+lpx
+
+2022
+lpx
+
+2023
+lpx
+
+2024
+lpx
+
+2025
+lpx
diff --git a/contrib/bc/tests/dc/scripts/easter.sh b/contrib/bc/tests/dc/scripts/easter.sh
deleted file mode 100755
index ee8fa1d94c81..000000000000
--- a/contrib/bc/tests/dc/scripts/easter.sh
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/sh
-#
-# SPDX-License-Identifier: BSD-2-Clause
-#
-# Copyright (c) 2018-2024 Gavin D. Howard and contributors.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# * Redistributions of source code must retain the above copyright notice, this
-#   list of conditions and the following disclaimer.
-#
-# * Redistributions in binary form must reproduce the above copyright notice,
-#   this list of conditions and the following disclaimer in the documentation
-#   and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-set -e
-
-script="$0"
-
-testdir=$(dirname "${script}")
-
-# Just print the usage and exit with an error. This can receive a message to
-# print.
-# @param 1  A message to print.
-usage() {
-	if [ $# -eq 1 ]; then
-		printf '%s\n\n' "$1"
-	fi
-	printf 'usage: %s dc_exec year [options...]\n' "$script"
-	exit 1
-}
-
-. "$testdir/../../../scripts/functions.sh"
-
-if test $# -lt 2
-then
-	usage "Not enough arguments; need 2"
-fi
-
-dc_exec="$1"
-shift
-check_exec_arg "$dc_exec"
-
-year="$1"
-shift
-
-echo $year '
-[
-	ddsf
-	[
-		lfp
-		[too early
-		]P
-		q
-	]s@
-	1583>@
-	ddd19%1+sg100/1+d3*4/12-sx8*5+25/5-sz5*4/lx-10-sdlg11*20+lz+lx-30%
-	d
-	[30+]s@
-	0>@d
-	[
-		[1+]s@
-		lg11<@
-	]s@
-	25=@d
-	[1+]s@
-	24=@se44le-d
-	[30+]s@
-	21>@dld+7%-7+
-	[March ]sm
-	d
-	[
-		31-
-		[April ]sm
-	]s@
-	31<@psnlmPpsn1z>p
-]sp
-lpx' | "$dc_exec" "$@" | tr '\012' ' '
-echo ''
diff --git a/contrib/bc/tests/dc/scripts/easter.txt b/contrib/bc/tests/dc/scripts/easter.txt
new file mode 100644
index 000000000000..0aef9531346d
--- /dev/null
+++ b/contrib/bc/tests/dc/scripts/easter.txt
@@ -0,0 +1,5 @@
+4 April 2021
+17 April 2022
+9 April 2023
+31 March 2024
+20 April 2025
diff --git a/contrib/bc/tests/dc/scripts/prime.dc b/contrib/bc/tests/dc/scripts/prime.dc
index cc769d2bbee1..6902aaef8f0c 100644
--- a/contrib/bc/tests/dc/scripts/prime.dc
+++ b/contrib/bc/tests/dc/scripts/prime.dc
@@ -1 +1 @@
-0k2p3p[dl!d2+s!%0=@l!l^!<#]s#[s/0ds^]s@[p]s&[ddvs^3s!l# x0<&2+d100000>.]ds.x
+0k2p3p[dl!d2+s!%0=@l!l^!<#]s#[s/0ds^]s@[p]s&[ddvs^3s!l# x0<&2+d10000>.]ds.x