summary refs log tree commit diff stats
path: root/testament
diff options
context:
space:
mode:
authorMiran <narimiran@disroot.org>2019-06-11 11:43:54 +0200
committerGitHub <noreply@github.com>2019-06-11 11:43:54 +0200
commit639e9a7aa9bed6d2379820e64f3b112241843be2 (patch)
treebe0097fe888c55b42610da829914cc326e2e14e2 /testament
parent51ac2e67bf53f299b3ca54614ef62afc021323bb (diff)
downloadNim-639e9a7aa9bed6d2379820e64f3b112241843be2.tar.gz
[other] test 6 more nimble packages (#11464)
Diffstat (limited to 'testament')
-rw-r--r--testament/categories.nim9
-rw-r--r--testament/important_packages.nim11
2 files changed, 11 insertions, 9 deletions
diff --git a/testament/categories.nim b/testament/categories.nim
index 4fddeb554..3db90d15f 100644
--- a/testament/categories.nim
+++ b/testament/categories.nim
@@ -474,11 +474,7 @@ iterator listPackages(): tuple[name, url, cmd: string, hasDeps: bool] =
   for n, cmd, hasDeps, url in important_packages.packages.items:
     let cmd = if cmd.len == 0: defaultCmd else: cmd
     if url.len != 0:
-      if hasDeps:
-        # use url instead of name, so we can do 'nimble install'
-        yield (url, url, cmd, hasDeps)
-      else:
-        yield (n, url, cmd, hasDeps)
+      yield (n, url, cmd, hasDeps)
     else:
       var found = false
       for package in packageList.items:
@@ -515,7 +511,8 @@ proc testNimblePackages(r: var TResults, cat: Category) =
       let buildPath = packagesDir / name
       if not existsDir(buildPath):
         if hasDep:
-          let (nimbleCmdLine, nimbleOutput, nimbleStatus) = execCmdEx2("nimble", ["install", "-y", name])
+          let installName = if url.len != 0: url else: name
+          let (nimbleCmdLine, nimbleOutput, nimbleStatus) = execCmdEx2("nimble", ["install", "-y", installName])
           if nimbleStatus != QuitSuccess:
             let message = "nimble install failed:\n$ " & nimbleCmdLine & "\n" & nimbleOutput
             r.addResult(test, targetC, "", message, reInstallFailed)
diff --git a/testament/important_packages.nim b/testament/important_packages.nim
index fbd97c96d..049b50e72 100644
--- a/testament/important_packages.nim
+++ b/testament/important_packages.nim
@@ -24,6 +24,7 @@ pkg "comprehension", "", false, "https://github.com/alehander42/comprehension"
 pkg "criterion"
 pkg "dashing", "nim c tests/functional.nim"
 pkg "docopt"
+pkg "easygl", "nim c -o:egl -r src/easygl.nim", true, "https://github.com/jackmott/easygl"
 pkg "fragments", "nim c -r fragments/dsl.nim"
 pkg "gara"
 pkg "glob"
@@ -49,17 +50,17 @@ pkg "nimfp", "nim c -o:nfp -r src/fp.nim", true
 pkg "nimgame2", "nim c nimgame2/nimgame.nim", true
 pkg "nimgen", "nim c -o:nimgenn -r src/nimgen/runcfg.nim", true
 # pkg "nimlsp", "", true
-# pkg "nimly", "nim c -r tests/test_nimly", true
+pkg "nimly", "nim c -r tests/test_nimly", true
 # pkg "nimongo", "nimble test_ci", true
 pkg "nimpy", "nim c -r tests/nimfrompy.nim"
 pkg "nimquery"
 pkg "nimsl", "", true
 pkg "nimsvg"
 pkg "nimx", "nim c --threads:on test/main.nim", true
-pkg "norm", "nim c -o:normm src/norm.nim"
+# pkg "norm", "nim c -o:normm src/norm.nim", true
 pkg "npeg"
 pkg "ormin", "nim c -o:orminn ormin.nim", true
-#pkg "parsetoml"
+pkg "parsetoml"
 pkg "patty"
 pkg "plotly", "nim c examples/all.nim", true
 pkg "protobuf", "nim c -o:protobuff -r src/protobuf.nim", true
@@ -68,11 +69,15 @@ pkg "result", "nim c -r result.nim"
 pkg "rosencrantz", "nim c -o:rsncntz -r rosencrantz.nim"
 pkg "sdl1", "nim c -r src/sdl.nim"
 pkg "sdl2_nim", "nim c -r sdl2/sdl.nim"
+pkg "snip", "", false, "https://github.com/genotrance/snip"
 pkg "stint", "nim c -o:stintt -r stint.nim"
 pkg "strunicode", "nim c -r src/strunicode.nim", true
+pkg "telebot", "nim c -o:tbot -r telebot.nim", true
 pkg "tiny_sqlite"
 pkg "unicodedb"
 pkg "unicodeplus", "", true
 pkg "unpack"
+pkg "with"
+# pkg "winim", "", true
 pkg "yaml"
 pkg "zero_functional", "nim c -r test.nim"