diff options
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | tests/manyloc/named_argument_bug/tri_engine/gfx/gl/gl.nim | 2 | ||||
| -rw-r--r-- | tests/manyloc/named_argument_bug/tri_engine/gfx/gl/shader.nim | 2 | ||||
| -rw-r--r-- | tests/manyloc/named_argument_bug/tri_engine/gfx/tex.nim | 2 | ||||
| -rw-r--r-- | tests/testament/categories.nim | 12 | ||||
| -rw-r--r-- | tests/testament/tester.nim | 6 |
6 files changed, 16 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml index f8655f940..9cd0b13c4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,14 +10,12 @@ addons: - libgc-dev before_script: - 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 - cd csources - sh build.sh - cd .. - sed -i -e 's,cc = gcc,cc = clang,' config/nim.cfg - - export PATH=$(pwd)/bin:$(pwd)/fasm:$PATH + - export PATH=$(pwd)/bin:$PATH script: - nim c koch - ./koch boot diff --git a/tests/manyloc/named_argument_bug/tri_engine/gfx/gl/gl.nim b/tests/manyloc/named_argument_bug/tri_engine/gfx/gl/gl.nim index 22d36ef4d..7d787c07b 100644 --- a/tests/manyloc/named_argument_bug/tri_engine/gfx/gl/gl.nim +++ b/tests/manyloc/named_argument_bug/tri_engine/gfx/gl/gl.nim @@ -6,7 +6,7 @@ export opengl type - EGL* = object of E_Base + EGL* = object of Exception EGL_code* = object of EGL code*: EGL_err EGL_err {.pure.} = enum diff --git a/tests/manyloc/named_argument_bug/tri_engine/gfx/gl/shader.nim b/tests/manyloc/named_argument_bug/tri_engine/gfx/gl/shader.nim index 89bb76064..970885b3d 100644 --- a/tests/manyloc/named_argument_bug/tri_engine/gfx/gl/shader.nim +++ b/tests/manyloc/named_argument_bug/tri_engine/gfx/gl/shader.nim @@ -8,7 +8,7 @@ type TShaderType* {.pure.} = enum frag = GL_FRAGMENT_SHADER, vert = GL_VERTEX_SHADER - E_Shader* = object of E_Base + E_Shader* = object of Exception E_UnknownShaderType* = object of E_Shader converter pathToShaderType*(s: string): TShaderType = diff --git a/tests/manyloc/named_argument_bug/tri_engine/gfx/tex.nim b/tests/manyloc/named_argument_bug/tri_engine/gfx/tex.nim index e5043ae34..282a1ac99 100644 --- a/tests/manyloc/named_argument_bug/tri_engine/gfx/tex.nim +++ b/tests/manyloc/named_argument_bug/tri_engine/gfx/tex.nim @@ -25,7 +25,7 @@ proc whiteTex*(): TTex = setTexParams() var pixel = [255'u8, 255'u8, 255'u8, 255'u8] - ?glTexImage2D(GLtexture2D, 0, GL_RGBA, 1, 1, 0, GL_BGRA, cGLUnsignedByte, pixel[0].addr) + ?glTexImage2D(GLtexture2D, 0, GLint GL_RGBA, 1, 1, 0, GL_BGRA, cGLUnsignedByte, pixel[0].addr) ?glBindTexture(GLtexture2D, 0) result = gWhiteTex 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) = |