diff options
| author | Araq <rumpf_a@web.de> | 2018-12-11 08:49:56 +0100 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2018-12-11 21:23:25 +0100 |
| commit | f3d2c18a127c6dd71696ddcd169d2b308cc4667f (patch) | |
| tree | 848810f51fa3cfe6a00152843c1ae180592b4330 | |
| parent | dc604ca762d33532a53ef0656f22ee991c67023e (diff) | |
| download | Nim-f3d2c18a127c6dd71696ddcd169d2b308cc4667f.tar.gz | |
attempt to make travis green
| -rw-r--r-- | testament/categories.nim | 5 | ||||
| -rw-r--r-- | testament/tester.nim | 2 | ||||
| -rw-r--r-- | tests/closure/tclosure.nim | 1 |
3 files changed, 4 insertions, 4 deletions
diff --git a/testament/categories.nim b/testament/categories.nim index d23f3384e..dac9db57d 100644 --- a/testament/categories.nim +++ b/testament/categories.nim @@ -499,8 +499,7 @@ proc testNimblePackages(r: var TResults, cat: Category, filter: PackageFilter) = # ---------------------------------------------------------------------------- -const AdditionalCategories = ["debugger", "examples", "lib"] -#, "megatest"] +const AdditionalCategories = ["debugger", "examples", "lib", "megatest"] proc `&.?`(a, b: string): string = # candidate for the stdlib? @@ -565,7 +564,7 @@ proc runJoinedTest(r: var TResults, cat: Category, testsDir: string) = echo buf quit("megatest compilation failed") - (buf, exitCode) = execCmdEx2("./megatest", [], {poStdErrToStdOut}, "") + (buf, exitCode) = execCmdEx("./megatest") if exitCode != 0: echo buf quit("megatest execution failed") diff --git a/testament/tester.nim b/testament/tester.nim index 29733e45c..6d9e05aa9 100644 --- a/testament/tester.nim +++ b/testament/tester.nim @@ -536,7 +536,7 @@ proc main() = var r = initResults() case action of "all": - processCategory(r, Category"megatest", p.cmdLineRest.string, testsDir, runJoinableTests = false) + #processCategory(r, Category"megatest", p.cmdLineRest.string, testsDir, runJoinableTests = false) var myself = quoteShell(findExe("testament" / "tester")) if targetsStr.len > 0: diff --git a/tests/closure/tclosure.nim b/tests/closure/tclosure.nim index c213d6a4b..cfef4193a 100644 --- a/tests/closure/tclosure.nim +++ b/tests/closure/tclosure.nim @@ -33,6 +33,7 @@ foo88 11 @[1, 10, 45, 120, 210, 252, 210, 120, 45, 10, 1] ''' +joinable: false """ |