Added testing libnullpay on windows

Signed-off-by: artem.ivanov <[email protected]>

Author: Artemkaaas

Jenkinsfile.cd

@@ -221,8 +221,7 @@ def linuxTesting(file, env_name, network_name, stashBuildResults) {
 
                 echo "${env_name} Libindy Test: Run tests"
                 sh "LD_LIBRARY_PATH=./ RUST_BACKTRACE=1 RUST_LOG=indy::=debug,zmq=trace RUST_TEST_THREADS=1 TEST_POOL_IP=10.0.0.2 cargo test --release"
-
-
+                
                 if (stashBuildResults) {
                     stash includes: 'target/release/libnullpay.so', name: 'LibnullpayUbuntuBuildResult'
                 }
@@ -308,6 +307,17 @@ def windowsTesting() {
                                 "RUST_BACKTRACE=1"
                         ]) {
                             bat "cargo build --release"
+                            bat "cargo test --release --no-run"
+
+                            echo "Windows Libnullpay Test: Run tests"
+                            withEnv([
+                                    "RUST_TEST_THREADS=1",
+                                    "RUST_LOG=indy::=debug,zmq=trace",
+                                    "TEST_POOL_IP=$INDY_SDK_SERVER_IP",
+                                    "PATH=$WORKSPACE\\libindy\\target\\release;$PATH",
+                            ]) {
+                                bat "cargo test --release"
+                            }
                         }
 
                         stash includes: 'target/release/*.dll', name: 'LibnullpayWindowsBuildResult'

Jenkinsfile.ci

@@ -65,6 +65,17 @@ def windowsTesting() {
                                 "RUST_BACKTRACE=1"
                         ]) {
                             bat "cargo build"
+                            bat "cargo test --no-run"
+
+                            echo "Windows Libnullpay Test: Run tests"
+                            withEnv([
+                                    "RUST_TEST_THREADS=1",
+                                    "RUST_LOG=indy::=debug,zmq=trace",
+                                    "TEST_POOL_IP=$INDY_SDK_SERVER_IP",
+                                    "PATH=$WORKSPACE\\libindy\\target\\debug;$PATH",
+                            ]) {
+                                bat "cargo test"
+                            }
                         }
                     }
 
@@ -264,7 +275,7 @@ def linuxTesting(file, env_name, network_name) {
                             sh "LIBRARY_PATH=./ RUST_BACKTRACE=1 cargo test --no-run"
 
                             echo "${env_name} Libnullpay Test: Run tests"
-                            sh "LD_LIBRARY_PATH=./:${LD_LIBRARY_PATH} RUST_BACKTRACE=1 RUST_LOG=indy::=debug,zmq=trace RUST_TEST_THREADS=1 TEST_POOL_IP=10.0.0.2 cargo test"
+                            sh 'LD_LIBRARY_PATH=./:${LD_LIBRARY_PATH} RUST_BACKTRACE=1 RUST_LOG=indy::=debug,zmq=trace RUST_TEST_THREADS=1 TEST_POOL_IP=10.0.0.2 cargo test'
                         }
                     }
                 },

libnullpay/Cargo.toml

@@ -2,6 +2,7 @@
 name = "null-payment-method"
 version = "0.1.0"
 authors = ["Nikita Khateev <[email protected]>"]
+build = "build.rs"
 
 [lib]
 name = "nullpay"

libnullpay/build.rs

@@ -1,18 +1,21 @@
 use std::env;
+use std::path::Path;
 
 fn main() {
     let target = env::var("TARGET").unwrap();
     println!("target={}", target);
 
     if target.find("-windows-").is_some() {
+        println!("cargo:rustc-link-lib=indy.dll");
+
         let profile = env::var("PROFILE").unwrap();
         println!("profile={}", profile);
 
         let indy_dir = env::var("INDY_DIR").unwrap_or(format!("..\\libindy\\target\\{}", profile));
         println!("indy_dir={}", indy_dir);
+        let indy_dir = Path::new(indy_dir.as_str());
 
-        println!("cargo:rustc-link-lib=dylib=indy.dll");
-        println!("cargo:rustc-flags=-L {}", indy_dir);
+        println!("cargo:rustc-flags=-L {}", indy_dir.as_os_str().to_str().unwrap());
     } else {
         println!("cargo:rustc-link-lib=indy");
     }