gentoo auto-resync : 11:01:2023 - 05:43:34

4 files changed, 107 insertions, 6 deletions

diff --git a/dev-lang/nim/Manifest b/dev-lang/nim/Manifest
index 02a4fa22d954..9463b0211654 100644
--- a/dev-lang/nim/Manifest
+++ b/dev-lang/nim/Manifest
@@ -1,4 +1,5 @@
 AUX nim-0.20.0-paths.patch 934 BLAKE2B 6a4e44c5656cde6d5127bf6a6b8db92cdf8aada0892c27d536d0c1030ed7da8dc97138a8941030101918021f2a301fa683169c8a656fefc6fb7d0fcdb24029d4 SHA512 bf8dbc3e3861ec3ea2718092b981e495194ead5b547e69d01d5d842d128dc4b96b0ba3e95c78afd8fd822d594199315a01de370851ed8f594c091231b9a10ee9
+AUX nim-1.6.10-testament-skipfile.txt 1210 BLAKE2B d70268fcef2edb5383ca7dc696ae393432e0894c313d17e192e988e8826b5c296d3fcdd7bc5d547d62b1450f3c721fe3655166fd9ee3755f29c9ae8390453fba SHA512 a943fa520633b513ae3c5060a79b9501b34cad81bcbebbd803780506713fe1a9fd1580736e85032d0dedcd4190ebc37666ae94f4ca73bf5d88d51df523d2c4ea
 AUX nim-1.6.6-csources-flags.patch 371 BLAKE2B 903e9738f6c87bc40ef922c5abde50edaff223cdf11befee0ece7b3a472a68b7dc211e1e6347a2181c68fe524693832f20309bf90aeb3aac9d76125f224587c9 SHA512 2753e14ada3093a2208636eb36eb2a79946f7c4858d86945b1d242d424b1a4350403b7d8f58af33c1c43a04b24465748cb7f26b7426e65b91d09cc61167d5de4
 AUX nim-sets.conf 162 BLAKE2B 976422f31cf8a64e1fad537f4db38a07e0022b9460936c63e0220cb3858ba02704857841d5010ad8c7bde0e6192c4c3c1329aeca8080a48a728e8b288cefc0fb SHA512 61a07de9973fc77998515bbb62498ffd1de991241bf32805f4acc0e4325e39d767ac862f2546757763aa8d0a7f35b95a9e1df91e6aa6f241eed6e93c8e3c46f0
 DIST nim-1.6.10.tar.xz 5216284 BLAKE2B d5b7bdc488086260b84700e3022ff7fc45b98d78574a3d2e288c95968a580fa644e47612dc60d6e63f5e85687f5b59a28128be746abc55bd6d4527344dc3ab14 SHA512 2ba6c4db68030ace2b4dd9b7f85d2b7c882c62e8f7f68bd0b82f548c91c300ab0e03c66f56c678127058f56b75a5550dec48d68eb6d666a179994cd1a6e2cc47
@@ -6,7 +7,7 @@ DIST nim-1.6.6.tar.xz 5149956 BLAKE2B 2fd1b40f1ecc1200255052d9e013c55287d3e01337
 DIST nim-1.6.8.tar.xz 5219880 BLAKE2B 16eac6f302b4ef1df14deaa0350e0e5553c7613515cc3e79cbe025af70955bef29c8261a1f91ba901023d9c53f9f00d62116301eb5a4ee4bb5314bb1e25a5755 SHA512 dd046dd393136fdcb78f463e267756bdb990b08e80e3a8be7fec1995b47a930447468e12bb9a59db6ec5546117f62ff4ccd032959879ef2d1d06a7bc5c438f83
 DIST nim-patches-1.6.6.tar.gz 1975 BLAKE2B 75490f4c61f4d920aadb2ad5908cb2773e270f80cee95f937ede8125bad5688b71840ed7f48659db892e4017437a0454b38eab18ae8b13c6b48207d0a7714371 SHA512 4d1590e7d05ad64432b943f8da9edb2b05213400181d1e07a0e40f479afbceb1997d0ea0f05a73d550afe60cf4b657f7e34840907ea16c3b9e96824e9f29e0e5
 DIST nim-patches-1.6.6_p1.tar.gz 2632 BLAKE2B 64980d9510dc48e3c566473dc618d00cafba04783882d62b12015e8435c9c0515d7726da30f0b74dca6a41aa88a9c9aed2189a65b3325c28839d0051de8a3365 SHA512 7ba251675cd564452669bf5ec3748565db818324f58506f20a5036e4b54df10f4d7c149cece8cb97c853222cfa7d4d8d26856d92aaa25e613e31c6f5c2a8243d
-EBUILD nim-1.6.10-r2.ebuild 3148 BLAKE2B 842cea7af252fcab429d8e63b2b1f2542a748abdd6564b43e1062c8b22e11f708e775382bcbe3970eee2d218be0b244111cdc3896b85e7f98d9ce423b5059d4f SHA512 6b94d93f7468503f056adec0208cc138215c0ae575cc009aa8fb5c00d4acf356db923a1418054487dcd2af27a8baa657b094d47cff111678f014fb68072a01ed
+EBUILD nim-1.6.10-r2.ebuild 4414 BLAKE2B 0ff4a5317d3a982e6331523e7e75d4d58bea5cb6c76e42d4884c39ca805afe8b42317583d169b6ddf1ee55c42edadfcfb3839208607f3e5b02dc6c546b1a9f07 SHA512 9ea1bf9733cbea435d9bf55343128f04bb9e861952c791c09b4ace8e99b097dfa8a717339bcc460f9dc660008373bcf57dd2131855fdeaac20540404ce34b416
 EBUILD nim-1.6.6-r3.ebuild 2541 BLAKE2B b48e502294c75eb8789d3352cbd45613dc6d98299c03e5471ead778aafa093758634efd526316f1a53dbfbbf1c2e5fba73a6c8ab53b3a36c7e108e2b739d2c73 SHA512 bf847f8f146c159f5bffce3e58391695afe417d0c17e786368ce2811d515bc69df4edfd6363c79e952f6f99f5f57e5fe37869087e3a0c575fcfa463a84a3718c
 EBUILD nim-1.6.8-r1.ebuild 2541 BLAKE2B 87b418ad6e1dd07c41a1b8a816afd4fdeaf562d06c84ce04219add81b367b5e5a6aeb9ff2e8d1250ce68bea097bc5946353691918a7f497998179128c114cd70 SHA512 655ed80e70ab3590ca805d6cd0ed4cd99839694ebfcd3a7b23b970d71ebe91de94254615a86b7deccc07b79537bfbc8df0623acde62f543711f9ed38bf04197f
-MISC metadata.xml 1975 BLAKE2B 892f172a8f69200207ce9f3f9415ec08adddf30e52d975a706c2de75e643a9a7e1e9911340ff9aaf9d74feb8e159172c90ecb7eb75642319afc8a5ab3d04f030 SHA512 69772a1e0469fdd71e28037eb2ecba46b78355a120fbacfb1c520e0e5c6c5a0b68fc5b7b0695f4ca7e682031f68a4350fe8108e97e64eb6b86b49fdc57b07977
+MISC metadata.xml 2041 BLAKE2B 4b7a5d50efe1dc57fc40858b03e37bd5eb77ff226460d561a7fb4ce1b2f3ab008ea5d1901d9e9308156e9f7e388c4b3353b726c90be6df2eb1a881ae35ef95ba SHA512 ed8509152bdf42f3aa8f95d98f55d4403521a3fea0f9e06b7503373761bdbdd01fcb14b5be00732d9966df2f2dacc4b0748a06994b06ec62b68e5550224e0e29
diff --git a/dev-lang/nim/files/nim-1.6.10-testament-skipfile.txt b/dev-lang/nim/files/nim-1.6.10-testament-skipfile.txt
new file mode 100644
index 000000000000..46d22c9fe915
--- /dev/null
+++ b/dev-lang/nim/files/nim-1.6.10-testament-skipfile.txt
@@ -0,0 +1,40 @@
+# broken
+tests/assert/tassert_c.nim
+tests/async/tasync_traceback.nim
+tests/errmsgs/tcall_with_default_arg.nim
+tests/errmsgs/tproper_stacktrace.nim
+tests/errmsgs/tproper_stacktrace2.nim
+tests/errmsgs/tproper_stacktrace3.nim
+tests/js/tmangle.nim
+tests/js/twritestacktrace.nim
+tests/lent/tbasic_lent_check.nim
+tests/misc/trunner.nim
+tests/misc/tstrace.nim
+tests/pragmas/thintprocessing.nim
+tests/pragmas/tused.nim
+tests/pragmas/twarning_off.nim
+tests/stdlib/tos.nim
+tests/stdlib/tstackframes.nim
+tests/stdlib/tstats.nim
+tests/system/talloc.nim
+tests/testament/tshould_not_work.nim
+# require network
+tests/stdlib/thttpclient.nim
+tests/stdlib/tnetconnect.nim
+tests/stdlib/tssl.nim
+# don't work without megatest
+tests/misc/tjoinable.nim
+tests/testament/tjoinable.nim
+# don't work with "--hint:all:off" hack
+tests/concepts/t3330.nim
+tests/stylecheck/t20397_2.nim
+tests/stylecheck/treject.nim
+tests/stylecheck/tusages.nim
+# need external dependencies
+tests/manyloc/keineschweine/keineschweine.nim
+tests/manyloc/nake/nakefile.nim
+tests/niminaction/Chapter7/Tweeter/src/tweeter.nim
+# need functional valgrind
+tests/destructor/tnewruntime_strutils.nim
+tests/destructor/tv2_raise.nim
+tests/views/tsplit_into_openarray.nim
diff --git a/dev-lang/nim/metadata.xml b/dev-lang/nim/metadata.xml
index d24270e82fb6..b544028faf59 100644
--- a/dev-lang/nim/metadata.xml
+++ b/dev-lang/nim/metadata.xml
@@ -38,5 +38,6 @@
   </upstream>
   <use>
     <flag name="experimental">Apply experimental patches</flag>
+    <flag name="test-js">Enable tests that require Node.js</flag>
   </use>
 </pkgmetadata>
diff --git a/dev-lang/nim/nim-1.6.10-r2.ebuild b/dev-lang/nim/nim-1.6.10-r2.ebuild
index 5140ee232527..5bbd9b8328f5 100644
--- a/dev-lang/nim/nim-1.6.10-r2.ebuild
+++ b/dev-lang/nim/nim-1.6.10-r2.ebuild
@@ -19,10 +19,29 @@ SRC_URI="
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc experimental"
-RESTRICT="test"  # need to sort out depends and numerous failures
+IUSE="doc experimental test-js test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		dev-db/sqlite:3
+		dev-libs/boehm-gc
+		dev-libs/libffi
+		dev-libs/libpcre:3
+		dev-libs/openssl
+		media-libs/libsdl
+		media-libs/libsfml
+	)
+"
 
-BDEPEND="sys-process/parallel"
+BDEPEND="
+	sys-process/parallel
+	test? (
+		test-js? (
+			net-libs/nodejs
+		)
+	)
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.20.0-paths.patch
@@ -51,6 +70,9 @@ nim_gen_config() {
 		$([[ "${NOCOLOR}" == true || "${NOCOLOR}" == yes ]] && echo '--colors:"off"')
 		-d:"release"
 		--parallelBuild:"$(makeopts_jobs)"
+
+		# some tests don't work with processing hints
+		--processing:"off"
 	EOF
 }
 
@@ -105,8 +127,45 @@ src_compile() {
 
 src_test() {
 	local -x PATH="${S}/bin:${PATH}"
+	local nimflags=(
+		# Leave only the safe hints enabled
+		--hint:all:off
+		--hint:User:on
+		--hint:UserRaw:on
+	)
+	local testament_args=(
+		--skipFrom:"${FILESDIR}/${P}-testament-skipfile.txt"
+		--nim:"bin/nim"
+		--targets:"$(usex test-js 'c js' 'c')"
+	)
+
+	[[ "${NOCOLOR}" == true || "${NOCOLOR}" == yes ]] && \
+		testament_args+=( --colors:off )
+
+	local -a categories
+	readarray -t categories < <(find tests -mindepth 1 -maxdepth 1 -type d -printf "%P\n" | sort)
+
+	# AdditionalCategories from "testament/categories.nim"
+	categories+=( debugger examples lib )
 
-	edo ./koch test
+	local tcat checkpoint
+	for tcat in "${categories[@]}"; do
+		# Use checkpoints for less painful testing
+		checkpoint="${T}/.testament-${tcat}"
+		[[ -f "${checkpoint}" ]] && continue
+
+		case ${tcat} in
+			testdata) ;;
+			arc|ic|valgrind)
+				einfo "Skipped category '${tcat}'" ;;
+			*)
+				einfo "Running tests in category '${tcat}'"
+				edo ./bin/testament "${testament_args[@]}" \
+					category "${tcat}" "${nimflags[@]}"
+		esac
+
+		touch "${checkpoint}" || die
+	done
 }
 
 src_install() {