You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/06/05 16:19:40 UTC
[4/5] incubator-ignite git commit: #nodejs: set ignite home to the
process.
#nodejs: set ignite home to the process.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4fddf362
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4fddf362
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4fddf362
Branch: refs/heads/nodejs
Commit: 4fddf362266073bfb4e5fc35a93cf915a91f52d4
Parents: 4e85890
Author: ivasilinets <iv...@gridgain.com>
Authored: Fri Jun 5 17:17:16 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Fri Jun 5 17:17:16 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/util/GridJavaProcess.java | 7 +++++--
.../java/org/apache/ignite/internal/NodeJsSelfTest.java | 12 +++++++++++-
2 files changed, 16 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fddf362/modules/core/src/main/java/org/apache/ignite/internal/util/GridJavaProcess.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridJavaProcess.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridJavaProcess.java
index 62655e7..b5b5f2b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridJavaProcess.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridJavaProcess.java
@@ -176,14 +176,15 @@ public final class GridJavaProcess {
/**
* Executes cmd in a separate system process.
*
- * @param cmd Command to run.
+ * @param cmd Commands to run.
+ * @param env Environment variable.
* @param log Log to use.
* @param printC Optional closure to be called each time wrapped process prints line to system.out or system.err.
* @param procKilledC Optional closure to be called when process termination is detected.
* @return Wrapper around {@link Process}
* @throws Exception If any problem occurred.
*/
- public static GridJavaProcess exec(String cmd, @Nullable IgniteLogger log,
+ public static GridJavaProcess exec(List<String> cmd, Map<String, String> env, @Nullable IgniteLogger log,
@Nullable IgniteInClosure<String> printC, @Nullable GridAbsClosure procKilledC)
throws Exception {
@@ -199,6 +200,8 @@ public final class GridJavaProcess {
builder.redirectErrorStream(true);
+ builder.environment().putAll(env);
+
Process proc = builder.start();
gjProc.osGrabber = gjProc.new ProcessStreamGrabber(proc.getInputStream(), printC);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fddf362/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsSelfTest.java b/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsSelfTest.java
index e526bbc..8366b778 100644
--- a/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsSelfTest.java
+++ b/modules/nodejs/src/test/java/org/apache/ignite/internal/NodeJsSelfTest.java
@@ -41,9 +41,19 @@ public class NodeJsSelfTest extends NodeJsAbstractTest {
final List<String> errors = new ArrayList<>();
+ List<String> cmd = new ArrayList<>();
+
+ cmd.add("C:\\Program Files\\nodejs\\node_modules\\.bin\\nodeunit.cmd");
+
+ cmd.add(getNodeJsTestDir() + "test.js");
+
+ Map<String, String> env = new HashMap<>();
+
+ env.put("IGNITE_HOME", "C:\\Users\\GridGain\\Documents\\GitHub\\incubator-ignite");
try {
proc = GridJavaProcess.exec(
- getNodeJsTestDir() + "runtest.bat",
+ cmd,
+ env,
log,
new CI1<String>() {
@Override