diff options
| author | Ganesh Viswanathan <dev@genotrance.com> | 2020-06-18 10:22:22 -0500 |
|---|---|---|
| committer | Ganesh Viswanathan <dev@genotrance.com> | 2020-06-18 10:22:22 -0500 |
| commit | 73885382da089f36447f67e7bd4e8710dfaa6714 (patch) | |
| tree | ae468d52fd7e597d8becaf9b7d79581567788313 /tests | |
| parent | d5e858bd9a580c834fe70cddeddaa0b76ad61395 (diff) | |
| download | nimterop-73885382da089f36447f67e7bd4e8710dfaa6714.tar.gz nimterop-73885382da089f36447f67e7bd4e8710dfaa6714.zip | |
Optional version and uri, no Std copy, reuse deps, jbb libc check
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/getheader.nims | 10 | ||||
| -rw-r--r-- | tests/libssh2.nim | 5 | ||||
| -rw-r--r-- | tests/lzma.nim | 2 | ||||
| -rw-r--r-- | tests/zlib.nim | 2 |
4 files changed, 9 insertions, 10 deletions
diff --git a/tests/getheader.nims b/tests/getheader.nims index 1d0ba1d..3fa8eb6 100644 --- a/tests/getheader.nims +++ b/tests/getheader.nims @@ -22,8 +22,8 @@ var zexp = "zlib version = " testCall(cmd & lrcmd, "No build files found", 1) -testCall(cmd & " -d:libssh2Conan" & sshcmd, "Need version for Conan uri", 1) -testCall(cmd & " -d:libssh2JBB" & sshcmd, "Need version for BinaryBuilder.org uri", 1) +testCall(cmd & " -d:libssh2Conan" & sshcmd, "Need version for Conan.io uri", 1) +testCall(cmd & " -d:libssh2JBB -d:libssh2SetVer=1.9.0" & sshcmd, "Version in both uri", 1) when defined(posix): # stdlib @@ -45,9 +45,10 @@ else: testCall(cmd & " -d:zlibConan -d:zlibSetVer=1.2.11 -d:zlibStatic" & zrcmd, zexp, 0) # JBB -testCall(cmd & " -d:libssh2JBB -d:libssh2SetVer=1.9.0" & sshcmd, zexp, 0) +testCall(cmd & " -d:libssh2JBB" & sshcmd, zexp, 0) testCall(cmd & " -d:zlibJBB -d:zlibSetVer=1.2.11" & zrcmd, zexp, 0) -testCall(cmd & " -d:zlibJBB -d:zlibSetVer=1.2.11 -d:zlibStatic" & zrcmd, zexp, 0) +testCall(cmd & " -d:zlibJBB -d:zlibSetVer=1.2.11 -d:zlibStatic" & zrcmd, zexp, 0, delete = false) +testCall(cmd & " -d:lzmaJBB -d:lzmaSetVer=5.2.4" & lrcmd, lexp & "5.2.4", 0) # git testCall(cmd & " -d:envTest" & zrcmd, zexp, 0) @@ -68,3 +69,4 @@ testCall(cmd & " -d:zlibDL -d:zlibStatic -d:zlibSetVer=1.2.11" & zrcmd, zexp & " # conan testCall(cmd & " -d:libssh2Conan -d:libssh2SetVer=1.9.0" & sshcmd, zexp, 0) +testCall(cmd & " -d:lzmaConan -d:lzmaSetVer=5.2.4" & lrcmd, lexp & "5.2.4", 0)
\ No newline at end of file diff --git a/tests/libssh2.nim b/tests/libssh2.nim index 48b8ba9..172f6ae 100644 --- a/tests/libssh2.nim +++ b/tests/libssh2.nim @@ -6,7 +6,7 @@ const getHeader( header = "libssh2.h", conanuri = "libssh2/$1", - jbburi = "libssh2/$1", + jbburi = "libssh2/1.9.0", outdir = outdir ) @@ -45,6 +45,3 @@ echo "zlib version = " & (block: else: "" ) - -static: - echo libssh2LDeps
\ No newline at end of file diff --git a/tests/lzma.nim b/tests/lzma.nim index cff39de..9bda18e 100644 --- a/tests/lzma.nim +++ b/tests/lzma.nim @@ -24,6 +24,8 @@ getHeader( "lzma.h", giturl = "https://github.com/xz-mirror/xz", dlurl = "https://tukaani.org/xz/xz-$1.tar.gz", + conanuri = "xz_utils", + jbburi = "xz", outdir = baseDir, conFlags = "--disable-xz --disable-xzdec --disable-lzmadec --disable-lzmainfo" ) diff --git a/tests/zlib.nim b/tests/zlib.nim index 2bd9395..53384c3 100644 --- a/tests/zlib.nim +++ b/tests/zlib.nim @@ -27,8 +27,6 @@ getHeader( "zlib.h", giturl = "https://github.com/madler/zlib", dlurl = "http://zlib.net/zlib-$1.tar.gz", - conanuri = "zlib/$1", - jbburi = "zlib/$1", outdir = baseDir, altNames = "z,zlib" ) |