diff options
| author | Ganesh Viswanathan <dev@genotrance.com> | 2019-10-10 07:56:47 -0500 |
|---|---|---|
| committer | Ganesh Viswanathan <dev@genotrance.com> | 2019-10-10 07:56:47 -0500 |
| commit | 6db698ea7a57a9fb9e4790ec768340a36b9e90e3 (patch) | |
| tree | 23054a82a84b45b10a1e2201980440176f3c0391 /tests | |
| parent | f2a0d4b0c9ed29ad83f3cc87ad8f4f02bde34dee (diff) | |
| download | nimterop-6db698ea7a57a9fb9e4790ec768340a36b9e90e3.tar.gz nimterop-6db698ea7a57a9fb9e4790ec768340a36b9e90e3.zip | |
Move all artifacts to nimcache
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/getheader.nims | 11 | ||||
| -rw-r--r-- | tests/lzma.nim | 2 | ||||
| -rw-r--r-- | tests/tpcre.nim | 4 | ||||
| -rw-r--r-- | tests/tsoloud.nim | 2 | ||||
| -rw-r--r-- | tests/zlib.nim | 2 |
5 files changed, 10 insertions, 11 deletions
diff --git a/tests/getheader.nims b/tests/getheader.nims index c122484..5a08429 100644 --- a/tests/getheader.nims +++ b/tests/getheader.nims @@ -1,16 +1,17 @@ import strutils proc testCall(cmd, output: string, exitCode: int, delete = true) = - if delete: - rmDir("build/liblzma") - rmDir("build/zlib") - echo cmd var ccmd = when defined(windows): "cmd /c " & cmd else: cmd + + if not delete: + ccmd = ccmd.replace(" -f ", " ") + + var (outp, exitC) = gorgeEx(ccmd) echo outp doAssert exitC == exitCode, $exitC @@ -41,7 +42,6 @@ when defined(posix): # git tag testCall(cmd & " -d:lzmaGit -d:lzmaSetVer=v5.2.0" & lrcmd, lexp & "5.2.0", 0) testCall(cmd & " -d:lzmaGit -d:lzmaStatic -d:lzmaSetVer=v5.2.0" & lrcmd, lexp & "5.2.0", 0, delete = false) - testCall("cd build/liblzma && git branch", "v5.2.0", 0, delete = false) # git testCall(cmd & " -d:envTest" & zrcmd, zexp, 0) @@ -50,7 +50,6 @@ 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) testCall(cmd & " -d:zlibGit -d:zlibStatic -d:zlibSetVer=v1.2.10" & zrcmd, zexp & "1.2.10", 0, delete = false) -testCall("cd build/zlib && git branch", "v1.2.10", 0, delete = false) # dl testCall(cmd & " -d:lzmaDL" & lrcmd, "Need version", 1) diff --git a/tests/lzma.nim b/tests/lzma.nim index 2368b55..785e0bb 100644 --- a/tests/lzma.nim +++ b/tests/lzma.nim @@ -3,7 +3,7 @@ import os, strutils import nimterop/[build, cimport] const - baseDir = currentSourcePath.parentDir()/"build"/"liblzma" + baseDir = getProjectCacheDir("nimterop" / "tests" / "liblzma") static: cDebug() diff --git a/tests/tpcre.nim b/tests/tpcre.nim index 5588850..5bc97da 100644 --- a/tests/tpcre.nim +++ b/tests/tpcre.nim @@ -3,7 +3,7 @@ import os import nimterop/[cimport, build, paths] const - baseDir = nimteropBuildDir()/"pcre" + baseDir = getProjectCacheDir("nimterop" / "tests" / "pcre") pcreH = baseDir/"pcre.h.in" static: @@ -32,4 +32,4 @@ cPlugin: cImport(pcreH, dynlib="dynpcre") -echo version()
\ No newline at end of file +echo version() diff --git a/tests/tsoloud.nim b/tests/tsoloud.nim index 12966a8..9281236 100644 --- a/tests/tsoloud.nim +++ b/tests/tsoloud.nim @@ -1,7 +1,7 @@ import os, nimterop/[cimport, build, paths] const - baseDir = nimteropBuildDir()/"soloud" + baseDir = getProjectCacheDir("nimterop" / "tests" / "soloud") incl = baseDir/"include" src = baseDir/"src" diff --git a/tests/zlib.nim b/tests/zlib.nim index 371d41f..572580c 100644 --- a/tests/zlib.nim +++ b/tests/zlib.nim @@ -3,7 +3,7 @@ import os, strutils import nimterop/[build, cimport] const - baseDir = currentSourcePath.parentDir()/"build"/"zlib" + baseDir = getProjectCacheDir("nimterop" / "tests" / "zlib") static: cDebug() |