rtyler
/
avatar-js
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix for AVATAR_JS-153, start signal handler in test, fix Constants package name

This commit is contained in:
jfdenise 2014-01-13 17:29:23 +01:00
parent ab8acf3298
commit 31d6bb37f7
4 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.xml
View File

@ -286,6 +286,7 @@
<apply-diff src="test/simple" mod="${test.dir}/simple" name="test-child-process-fork-exec-path.js"/>
<apply-diff src="test/simple" mod="${test.dir}/simple" name="test-child-process-fork-net2.js"/>
<apply-diff src="test/simple" mod="${test.dir}/simple" name="test-cli-eval.js"/>
<apply-diff src="test/simple" mod="${test.dir}/simple" name="test-cluster-bind-twice-v2.js"/>
<apply-diff src="test/simple" mod="${test.dir}/simple" name="test-cluster-http-pipe.js"/>
<apply-diff src="test/simple" mod="${test.dir}/simple" name="test-dgram-address.js"/>
<apply-diff src="test/simple" mod="${test.dir}/simple" name="test-dgram-broadcast-multi-process.js"/>
@ -386,6 +387,7 @@
<apply-patch-file target="${test.dir}/simple" dir="test/simple" name="test-child-process-fork-exec-path.js"/>
<apply-patch-file target="${test.dir}/simple" dir="test/simple" name="test-child-process-fork-net2.js"/>
<apply-patch-file target="${test.dir}/simple" dir="test/simple" name="test-cli-eval.js"/>
<apply-patch-file target="${test.dir}/simple" dir="test/simple" name="test-cluster-bind-twice-v2.js"/>
<apply-patch-file target="${test.dir}/simple" dir="test/simple" name="test-cluster-http-pipe.js"/>
<apply-patch-file target="${test.dir}/simple" dir="test/simple" name="test-dgram-address.js"/>
<apply-patch-file target="${test.dir}/simple" dir="test/simple" name="test-dgram-broadcast-multi-process.js"/>

11
patches/test/simple/test-cluster-bind-twice-v2.js.patch Normal file
View File

@ -0,0 +1,11 @@
--- ../node/test/simple/test-cluster-bind-twice-v2.js 2013-12-09 10:27:58.000000000 +0100
+++ ./test/simple/test-cluster-bind-twice-v2.js 2014-01-13 17:24:40.000000000 +0100
@@ -117,6 +117,8 @@
function startWorker() {
var worker = cluster.fork();
+ // Avatar.js specific
+ process.signals.start('SIGTERM');
worker.on('message', process.send.bind(process));
process.on('message', worker.send.bind(worker));
process.on('SIGTERM', function() {

1
project.properties
View File

@ -135,6 +135,7 @@ source.test.simple.list = \
test-cli-eval.js \
test-cluster-basic.js \
test-cluster-bind-twice-v1.js \
test-cluster-bind-twice-v2.js \
test-cluster-dgram-1.js \
test-cluster-dgram-2.js \
test-cluster-disconnect.js \

2
src/main/js/lib/process.js
View File

@ -68,7 +68,7 @@ var SignalHandle = Packages.com.oracle.libuv.handles.SignalHandle;
var Process = Packages.com.oracle.avatar.js.os.Process;
var Server = Packages.com.oracle.avatar.js.Server;
var Constants = Packages.com.oracle.avatar.js.constants.Constants;
var Constants = Packages.com.oracle.libuv.Constants;
var ScriptUtils = Packages.jdk.nashorn.api.scripting.ScriptUtils