diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2016-07-30 16:31:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-30 16:31:58 +0200 |
| commit | 223863c536287aae0fa84e9246ff2f3d30f09437 (patch) | |
| tree | b304c69288b6bcfa2e0ab8088b76ded6cc21cc46 /tests | |
| parent | 2605c8c4ced0b088d5619d86903d659e8ff89a76 (diff) | |
| parent | 85db7eb187d6fd1c9440e689c47a33631d25e358 (diff) | |
| download | Nim-223863c536287aae0fa84e9246ff2f3d30f09437.tar.gz | |
Merge pull request #4538 from cheatfate/nofasm
Disable fasm usage on Travis CI
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/testament/categories.nim | 12 | ||||
| -rw-r--r-- | tests/testament/tester.nim | 6 |
2 files changed, 12 insertions, 6 deletions
diff --git a/tests/testament/categories.nim b/tests/testament/categories.nim index 125643d5a..e534cc161 100644 --- a/tests/testament/categories.nim +++ b/tests/testament/categories.nim @@ -260,12 +260,14 @@ proc compileExample(r: var TResults, pattern, options: string, cat: Category) = testNoSpec r, makeTest(test, options, cat) proc testStdlib(r: var TResults, pattern, options: string, cat: Category) = + var disabledSet = disabledFiles.toSet() for test in os.walkFiles(pattern): - let contents = readFile(test).string - if contents.contains("when isMainModule"): - testSpec r, makeTest(test, options, cat, actionRunNoSpec) - else: - testNoSpec r, makeTest(test, options, cat, actionCompile) + if test notin disabledSet: + let contents = readFile(test).string + if contents.contains("when isMainModule"): + testSpec r, makeTest(test, options, cat, actionRunNoSpec) + else: + testNoSpec r, makeTest(test, options, cat, actionCompile) # ----------------------------- nimble ---------------------------------------- type PackageFilter = enum diff --git a/tests/testament/tester.nim b/tests/testament/tester.nim index 9a253d0ff..6981f3c0c 100644 --- a/tests/testament/tester.nim +++ b/tests/testament/tester.nim @@ -12,7 +12,7 @@ import parseutils, strutils, pegs, os, osproc, streams, parsecfg, json, marshal, backend, parseopt, specs, htmlgen, browsers, terminal, - algorithm, compiler/nodejs, re, times + algorithm, compiler/nodejs, re, times, sets const resultsFile = "testresults.html" @@ -388,6 +388,10 @@ proc makeTest(test, options: string, cat: Category, action = actionCompile, result = TTest(cat: cat, name: test, options: options, target: target, action: action, startTime: epochTime()) +const + # array of modules disabled from compilation test of stdlib. + disabledFiles = ["lib/pure/coro.nim"] + include categories # proc runCaasTests(r: var TResults) = |