diff options
| author | Ganesh Viswanathan <dev@genotrance.com> | 2019-09-25 21:15:14 -0500 |
|---|---|---|
| committer | Ganesh Viswanathan <dev@genotrance.com> | 2019-10-02 15:31:57 -0500 |
| commit | fad9fd78f30eda750e615f69dd88f28158effbce (patch) | |
| tree | 464d91970e16183f65939b5b88f471b02bdd8c4e /tests | |
| parent | f21315ff1747ce0814f3a1e480f7b2e01ad9a278 (diff) | |
| download | nimterop-fad9fd78f30eda750e615f69dd88f28158effbce.tar.gz nimterop-fad9fd78f30eda750e615f69dd88f28158effbce.zip | |
Add env var support for defines
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/getheader.nims | 8 | ||||
| -rw-r--r-- | tests/lzma.nim | 9 | ||||
| -rw-r--r-- | tests/zlib.nim | 9 |
3 files changed, 18 insertions, 8 deletions
diff --git a/tests/getheader.nims b/tests/getheader.nims index e489380..c122484 100644 --- a/tests/getheader.nims +++ b/tests/getheader.nims @@ -27,8 +27,8 @@ testCall(cmd & lrcmd, "No build files found", 1) when defined(posix): # stdlib - testCall(cmd & " -d:lzmaStd" & lrcmd, lexp, 0) - testCall(cmd & " -d:lzmaStd -d:lzmaStatic" & lrcmd, lexp, 0) + testCall(cmd & " -d:envTest" & lrcmd, lexp, 0) + testCall(cmd & " -d:envTestStatic" & lrcmd, lexp, 0) when not defined(osx): testCall(cmd & " -d:zlibStd" & zrcmd, zexp, 0) @@ -44,8 +44,8 @@ when defined(posix): testCall("cd build/liblzma && git branch", "v5.2.0", 0, delete = false) # git -testCall(cmd & " -d:zlibGit" & zrcmd, zexp, 0) -testCall(cmd & " -d:zlibGit -d:zlibStatic" & zrcmd, zexp, 0, delete = false) +testCall(cmd & " -d:envTest" & zrcmd, zexp, 0) +testCall(cmd & " -d:envTestStatic" & zrcmd, zexp, 0, delete = false) # git tag testCall(cmd & " -d:zlibGit -d:zlibSetVer=v1.2.10" & zrcmd, zexp & "1.2.10", 0) diff --git a/tests/lzma.nim b/tests/lzma.nim index 422f94d..32f9fa0 100644 --- a/tests/lzma.nim +++ b/tests/lzma.nim @@ -8,6 +8,11 @@ const static: cDebug() +when defined(envTest): + setDefines(@["lzmaStd"]) +elif defined(envTestStatic): + setDefines(@["lzmaStd", "lzmaStatic"]) + getHeader( "lzma.h", giturl = "https://github.com/xz-mirror/xz", @@ -33,9 +38,9 @@ cOverride: lzma_block = object lzma_index_iter = object -when not defined(lzmaStatic): +when not lzmaStatic: cImport(lzmaPath, recurse = true, dynlib = "lzmaLPath") else: cImport(lzmaPath, recurse = true) -echo "liblzma version = " & $lzma_version_string()
\ No newline at end of file +echo "liblzma version = " & $lzma_version_string() diff --git a/tests/zlib.nim b/tests/zlib.nim index 6da7cdc..371d41f 100644 --- a/tests/zlib.nim +++ b/tests/zlib.nim @@ -19,6 +19,11 @@ proc zlibPreBuild(outdir, path: string) = # Fix static lib name on Windows setCmakeLibName(outdir, "zlibstatic", prefix = "lib", oname = "zlib", suffix = ".a") +when defined(envTest): + setDefines(@["zlibGit"]) +elif defined(envTestStatic): + setDefines(@["zlibGit", "zlibStatic"]) + getHeader( "zlib.h", giturl = "https://github.com/madler/zlib", @@ -56,11 +61,11 @@ when defined(posix): static: cSkipSymbol(@["u_int8_t", "u_int16_t", "u_int32_t", "u_int64_t"]) -when defined(zlibGit) or defined(zlibDL): +when zlibGit or zlibDL: when dirExists(baseDir / "buildcache"): cIncludeDir(baseDir / "buildcache") -when not defined(zlibStatic): +when not zlibStatic: cImport(zlibPath, recurse = true, dynlib = "zlibLPath") else: cImport(zlibPath, recurse = true) |