refs #68; turn some macros to CT procs; fix #112 (doc fixes) (#102)

* refs #68 macro=>proc cSkipSymbol
* refs #68 macro=>proc cDebug
* refs #68 macro=>proc cDisableCaching
* refs #68 notes for cDefine
* refs #68 macro=>proc cAddSearchDir ; improve some runnableExamples
* refs #68 macro=>proc cAddStdDir
* $projpath/include => testsIncludeDir() everywhere
* disable $projpath interpolation (error prone)
* fix tests
* make nim doc part of test suite; fix for 0.19.2
This commit is contained in:
Timothee Cour 2019-02-02 16:03:46 -08:00 • committed by genotrance
commit 9fe45ac32b
11 changed files with 99 additions and 77 deletions

View file

@ -0,0 +1,7 @@
#[
pending https://github.com/nim-lang/Nim/pull/10530
note: nimble init installs something like this (maybe without src in this case)
switch("path", "$projectDir/../src")
but it doesn't seem robust in case tests have subdirs, so, changing to ../ seems better
]#
switch("path", "..")

2
tests/nim.cfg Normal file
View file

@ -0,0 +1,2 @@
# TODO: pending https://github.com/nimterop/nimterop/issues/110 remove in favor of config.nims
--path:".."

View file

@ -1,15 +1,15 @@
import nimterop/cimport
import unittest
import nimterop/cimport
type
locale_t = object
mingw_ldbl_type_t = object
mingw_dbl_type_t = object
cDebug()
cDisableCaching()
cAddStdDir()
static:
cDebug()
cDisableCaching()
cAddStdDir()
cPlugin:
import strutils
@ -21,4 +21,4 @@ cImport cSearchPath("math.h")
check sin(5) == -0.9589242746631385
check abs(-5) == 5
check sqrt(4.00) == 2.0
check sqrt(4.00) == 2.0

View file

@ -1,12 +1,14 @@
import std/unittest
import nimterop/cimport
import nimterop/paths
cDebug()
cDisableCaching()
static:
cDebug()
cDisableCaching()
cAddSearchDir testsIncludeDir()
cDefine("FORCE")
cIncludeDir "$projpath/include"
cAddSearchDir "$projpath/include"
cIncludeDir testsIncludeDir()
cCompile cSearchPath("test.c")
cPlugin:
@ -137,8 +139,6 @@ var
k: uKernel
kp: Kernel
cAddStdDir()
## failing tests
when false:
static: # Error: undeclared identifier: 'foobar1'

View file

@ -1,11 +1,13 @@
import nimterop/cimport
import unittest
import nimterop/cimport
import nimterop/paths
cDebug()
cDisableCaching()
static:
cDebug()
cDisableCaching()
cAddSearchDir testsIncludeDir()
cIncludeDir "$projpath/include"
cAddSearchDir "$projpath/include"
cIncludeDir testsIncludeDir()
cCompile cSearchPath "test2.cpp"
cImport cSearchPath "test2.hpp"

View file

@ -7,9 +7,8 @@ const
static:
gitPull("https://github.com/jarikomppa/soloud", baseDir, "include/*\nsrc/*\n")
cDebug()
cDisableCaching()
cDebug()
cDisableCaching()
cOverride:
type
@ -18,7 +17,7 @@ cOverride:
proc Soloud_destroy*(aSoloud: ptr Soloud) {.importc: "Soloud_destroy", header: cSearchPath(incl/"soloud_c.h").}
cSkipSymbol("WavStream_stop", "WavStream_setFilter")
static: cSkipSymbol @["WavStream_stop", "WavStream_setFilter"]
cIncludeDir(incl)