jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4538 from cheatfate/nofasm

Browse source 
Disable fasm usage on Travis CI
This commit is contained in:
Andreas Rumpf 2016-07-30 16:31:58 +02:00 • committed by GitHub
commit 223863c536
3 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tests/testament/categories.nim
View file

@ -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

6
tests/testament/tester.nim
View file

@ -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) =