Merge pull request #4538 from cheatfate/nofasm
Disable fasm usage on Travis CI
This commit is contained in:
commit
223863c536
3 changed files with 13 additions and 9 deletions
|
|
@ -10,14 +10,12 @@ addons:
|
||||||
- libgc-dev
|
- libgc-dev
|
||||||
before_script:
|
before_script:
|
||||||
- set -e
|
- set -e
|
||||||
- wget http://flatassembler.net/fasm-1.71.39.tgz
|
|
||||||
- tar xvf fasm-1.71.39.tgz
|
|
||||||
- git clone --depth 1 https://github.com/nim-lang/csources.git
|
- git clone --depth 1 https://github.com/nim-lang/csources.git
|
||||||
- cd csources
|
- cd csources
|
||||||
- sh build.sh
|
- sh build.sh
|
||||||
- cd ..
|
- cd ..
|
||||||
- sed -i -e 's,cc = gcc,cc = clang,' config/nim.cfg
|
- sed -i -e 's,cc = gcc,cc = clang,' config/nim.cfg
|
||||||
- export PATH=$(pwd)/bin:$(pwd)/fasm:$PATH
|
- export PATH=$(pwd)/bin:$PATH
|
||||||
script:
|
script:
|
||||||
- nim c koch
|
- nim c koch
|
||||||
- ./koch boot
|
- ./koch boot
|
||||||
|
|
|
||||||
|
|
@ -260,12 +260,14 @@ proc compileExample(r: var TResults, pattern, options: string, cat: Category) =
|
||||||
testNoSpec r, makeTest(test, options, cat)
|
testNoSpec r, makeTest(test, options, cat)
|
||||||
|
|
||||||
proc testStdlib(r: var TResults, pattern, options: string, cat: Category) =
|
proc testStdlib(r: var TResults, pattern, options: string, cat: Category) =
|
||||||
|
var disabledSet = disabledFiles.toSet()
|
||||||
for test in os.walkFiles(pattern):
|
for test in os.walkFiles(pattern):
|
||||||
let contents = readFile(test).string
|
if test notin disabledSet:
|
||||||
if contents.contains("when isMainModule"):
|
let contents = readFile(test).string
|
||||||
testSpec r, makeTest(test, options, cat, actionRunNoSpec)
|
if contents.contains("when isMainModule"):
|
||||||
else:
|
testSpec r, makeTest(test, options, cat, actionRunNoSpec)
|
||||||
testNoSpec r, makeTest(test, options, cat, actionCompile)
|
else:
|
||||||
|
testNoSpec r, makeTest(test, options, cat, actionCompile)
|
||||||
|
|
||||||
# ----------------------------- nimble ----------------------------------------
|
# ----------------------------- nimble ----------------------------------------
|
||||||
type PackageFilter = enum
|
type PackageFilter = enum
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@
|
||||||
import
|
import
|
||||||
parseutils, strutils, pegs, os, osproc, streams, parsecfg, json,
|
parseutils, strutils, pegs, os, osproc, streams, parsecfg, json,
|
||||||
marshal, backend, parseopt, specs, htmlgen, browsers, terminal,
|
marshal, backend, parseopt, specs, htmlgen, browsers, terminal,
|
||||||
algorithm, compiler/nodejs, re, times
|
algorithm, compiler/nodejs, re, times, sets
|
||||||
|
|
||||||
const
|
const
|
||||||
resultsFile = "testresults.html"
|
resultsFile = "testresults.html"
|
||||||
|
|
@ -388,6 +388,10 @@ proc makeTest(test, options: string, cat: Category, action = actionCompile,
|
||||||
result = TTest(cat: cat, name: test, options: options,
|
result = TTest(cat: cat, name: test, options: options,
|
||||||
target: target, action: action, startTime: epochTime())
|
target: target, action: action, startTime: epochTime())
|
||||||
|
|
||||||
|
const
|
||||||
|
# array of modules disabled from compilation test of stdlib.
|
||||||
|
disabledFiles = ["lib/pure/coro.nim"]
|
||||||
|
|
||||||
include categories
|
include categories
|
||||||
|
|
||||||
# proc runCaasTests(r: var TResults) =
|
# proc runCaasTests(r: var TResults) =
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue