summary refs log tree commit diff stats
path: root/testament/categories.nim
diff options
context:
space:
mode:
authormetagn <metagngn@gmail.com>2022-09-03 10:52:13 +0300
committerGitHub <noreply@github.com>2022-09-03 09:52:13 +0200
commit86f7f4ffa5b8d84cbff12afbcd9b88d3ceb429c8 (patch)
treea33f6930efe6342f9e4a9bb4b72c12f68213005e /testament/categories.nim
parentf540fd5cde268d2ecd1e22a20cac0879bf405f85 (diff)
downloadNim-86f7f4ffa5b8d84cbff12afbcd9b88d3ceb429c8.tar.gz
remove deprecated type pragma syntax, fix bugs that required it (#20199)
* remove deprecated pragma syntax from 0.20.0

closes #4651, closes #16653 with a cheap fix for now due to
how early `tfFinal` is set

* remove type pragma between name and generics

* undo removal, try removing bind expression (0.8.14)

* fix test, unremove bind expr

* remove again

* Update changelog.md

Co-authored-by: konsumlamm <44230978+konsumlamm@users.noreply.github.com>

* dependencies @ HEAD & weave test dependencies

* try fix package ci

Co-authored-by: konsumlamm <44230978+konsumlamm@users.noreply.github.com>
Diffstat (limited to 'testament/categories.nim')
-rw-r--r--testament/categories.nim7
1 files changed, 5 insertions, 2 deletions
diff --git a/testament/categories.nim b/testament/categories.nim
index 43ea9f0ee..612f5287f 100644
--- a/testament/categories.nim
+++ b/testament/categories.nim
@@ -13,7 +13,7 @@
 # included from testament.nim
 
 import important_packages
-import std/strformat
+import std/[strformat, strutils]
 from std/sequtils import filterIt
 
 const
@@ -448,7 +448,10 @@ proc testNimblePackages(r: var TResults; cat: Category; packageFilter: string) =
           let describeOutput = tryCommand("git describe --tags --abbrev=0")
           discard tryCommand("git checkout $#" % [describeOutput.strip.quoteShell])
         discard tryCommand("nimble install --depsOnly -y", maxRetries = 3)
-      discard tryCommand(pkg.cmd, reFailed = reBuildFailed)
+      let cmds = pkg.cmd.split(';')
+      for i in 0 ..< cmds.len - 1:
+        discard tryCommand(cmds[i], maxRetries = 3)
+      discard tryCommand(cmds[^1], reFailed = reBuildFailed)
       inc r.passed
       r.addResult(test, targetC, "", "", "", reSuccess, allowFailure = pkg.allowFailure)