aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nimterop.nimble13
-rw-r--r--tests/tsoloud.nim1
2 files changed, 10 insertions, 4 deletions
diff --git a/nimterop.nimble b/nimterop.nimble
index 368ec29..11d8342 100644
--- a/nimterop.nimble
+++ b/nimterop.nimble
@@ -12,10 +12,14 @@ installDirs = @["nimterop"]
requires "nim >= 0.19.0", "regex >= 0.10.0", "cligen >= 0.9.17"
-proc execCmd(cmd: string)=
+proc execCmd(cmd: string) =
echo cmd
exec cmd
+proc tsoloud() =
+ execCmd "nim c -r tests/tsoloud.nim"
+ execCmd "nim cpp -r tests/tsoloud.nim"
+
task test, "Test":
execCmd "nim c -r tests/tnimterop_c.nim"
execCmd "nim cpp -r tests/tnimterop_c.nim"
@@ -24,5 +28,8 @@ task test, "Test":
execCmd "nim c -r tests/tmath.nim"
execCmd "nim cpp -r tests/tmath.nim"
when not defined(OSX):
- execCmd "nim c -r tests/tsoloud.nim"
- execCmd "nim cpp -r tests/tsoloud.nim" \ No newline at end of file
+ when defined(Windows):
+ tsoloud()
+ else:
+ if not existsEnv("TRAVIS"):
+ tsoloud() \ No newline at end of file
diff --git a/tests/tsoloud.nim b/tests/tsoloud.nim
index 0890ca1..544c1af 100644
--- a/tests/tsoloud.nim
+++ b/tests/tsoloud.nim
@@ -11,7 +11,6 @@ const
cIncludeDir(inc)
when defined(Linux):
- {.passC: "-std=c++11".}
{.passL: "-lpthread".}
cDefine("WITH_OSS")
cCompile(src/"backend/oss/*.cpp")