test: split test in parallel/sequential

Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
PR-URL: https://github.com/iojs/io.js/pull/172
Fix: iojs/io.js#139

diff --git a/Makefile b/Makefile
index 46dca45..114d198 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -90,15 +90,18 @@ distclean:
        -rm -rf node_modules
 
 test: all
-       $(PYTHON) tools/test.py --mode=release simple message
+       $(PYTHON) tools/test.py --mode=release message parallel sequential
        $(MAKE) jslint
        $(MAKE) cpplint
 
+test-parallel: all
+       $(PYTHON) tools/test.py --mode=release parallel -J
+
 test-http1: all
-       $(PYTHON) tools/test.py --mode=release --use-http1 simple message
+       $(PYTHON) tools/test.py --mode=release --use-http1 sequential parallel message
 
 test-valgrind: all
-       $(PYTHON) tools/test.py --mode=release --valgrind simple message
+       $(PYTHON) tools/test.py --mode=release --valgrind sequential parallel message
 
 test/gc/node_modules/weak/build/Release/weakref.node:
        @if [ ! -f $(NODE_EXE) ]; then make all; fi
@@ -141,7 +144,7 @@ test-message: test-build
        $(PYTHON) tools/test.py message
 
 test-simple: all
-       $(PYTHON) tools/test.py simple
+       $(PYTHON) tools/test.py parallel sequential
 
 test-pummel: all wrk
        $(PYTHON) tools/test.py pummel

diff --git a/test/simple/path.js b/test/fixtures/path.js
similarity index 100%
rename from test/simple/path.js
rename to test/fixtures/path.js

diff --git a/test/simple/simple.status b/test/parallel/simple.status
similarity index 100%
rename from test/simple/simple.status
rename to test/parallel/simple.status

diff --git a/test/simple/test-assert.js b/test/parallel/test-assert.js
similarity index 100%
rename from test/simple/test-assert.js
rename to test/parallel/test-assert.js

diff --git a/test/simple/test-bad-unicode.js b/test/parallel/test-bad-unicode.js
similarity index 100%
rename from test/simple/test-bad-unicode.js
rename to test/parallel/test-bad-unicode.js

diff --git a/test/simple/test-beforeexit-event-exit.js b/test/parallel/test-beforeexit-event-exit.js
similarity index 100%
rename from test/simple/test-beforeexit-event-exit.js
rename to test/parallel/test-beforeexit-event-exit.js

diff --git a/test/simple/test-beforeexit-event.js b/test/parallel/test-beforeexit-event.js
similarity index 97%
rename from test/simple/test-beforeexit-event.js
rename to test/parallel/test-beforeexit-event.js
index 41cc1d3..d1e2093 100644 (file)
--- a/test/simple/test-beforeexit-event.js
+++ b/test/parallel/test-beforeexit-event.js
@@ -22,6 +22,7 @@
 var assert = require('assert');
 var net = require('net');
 var util = require('util');
+var common = require('../common');
 var revivals = 0;
 var deaths = 0;
 
@@ -49,7 +50,7 @@ function tryTimer() {
 function tryListen() {
   console.log('create a server');
   net.createServer()
-    .listen(0)
+    .listen(common.PORT)
     .on('listening', function() {
       revivals++;
       this.close();

diff --git a/test/simple/test-buffer-ascii.js b/test/parallel/test-buffer-ascii.js
similarity index 100%
rename from test/simple/test-buffer-ascii.js
rename to test/parallel/test-buffer-ascii.js

diff --git a/test/simple/test-buffer-concat.js b/test/parallel/test-buffer-concat.js
similarity index 100%
rename from test/simple/test-buffer-concat.js
rename to test/parallel/test-buffer-concat.js

diff --git a/test/simple/test-buffer-inspect.js b/test/parallel/test-buffer-inspect.js
similarity index 100%
rename from test/simple/test-buffer-inspect.js
rename to test/parallel/test-buffer-inspect.js

diff --git a/test/simple/test-buffer-slice.js b/test/parallel/test-buffer-slice.js
similarity index 100%
rename from test/simple/test-buffer-slice.js
rename to test/parallel/test-buffer-slice.js

diff --git a/test/simple/test-buffer.js b/test/parallel/test-buffer.js
similarity index 100%
rename from test/simple/test-buffer.js
rename to test/parallel/test-buffer.js

diff --git a/test/simple/test-c-ares.js b/test/parallel/test-c-ares.js
similarity index 100%
rename from test/simple/test-c-ares.js
rename to test/parallel/test-c-ares.js

diff --git a/test/simple/test-child-process-buffering.js b/test/parallel/test-child-process-buffering.js
similarity index 100%
rename from test/simple/test-child-process-buffering.js
rename to test/parallel/test-child-process-buffering.js

diff --git a/test/simple/test-child-process-cwd.js b/test/parallel/test-child-process-cwd.js
similarity index 100%
rename from test/simple/test-child-process-cwd.js
rename to test/parallel/test-child-process-cwd.js

diff --git a/test/simple/test-child-process-default-options.js b/test/parallel/test-child-process-default-options.js
similarity index 100%
rename from test/simple/test-child-process-default-options.js
rename to test/parallel/test-child-process-default-options.js

diff --git a/test/simple/test-child-process-detached.js b/test/parallel/test-child-process-detached.js
similarity index 100%
rename from test/simple/test-child-process-detached.js
rename to test/parallel/test-child-process-detached.js

diff --git a/test/simple/test-child-process-disconnect.js b/test/parallel/test-child-process-disconnect.js
similarity index 100%
rename from test/simple/test-child-process-disconnect.js
rename to test/parallel/test-child-process-disconnect.js

diff --git a/test/simple/test-child-process-double-pipe.js b/test/parallel/test-child-process-double-pipe.js
similarity index 100%
rename from test/simple/test-child-process-double-pipe.js
rename to test/parallel/test-child-process-double-pipe.js

diff --git a/test/simple/test-child-process-env.js b/test/parallel/test-child-process-env.js
similarity index 100%
rename from test/simple/test-child-process-env.js
rename to test/parallel/test-child-process-env.js

diff --git a/test/simple/test-child-process-exec-buffer.js b/test/parallel/test-child-process-exec-buffer.js
similarity index 100%
rename from test/simple/test-child-process-exec-buffer.js
rename to test/parallel/test-child-process-exec-buffer.js

diff --git a/test/simple/test-child-process-exec-cwd.js b/test/parallel/test-child-process-exec-cwd.js
similarity index 100%
rename from test/simple/test-child-process-exec-cwd.js
rename to test/parallel/test-child-process-exec-cwd.js

diff --git a/test/simple/test-child-process-exec-env.js b/test/parallel/test-child-process-exec-env.js
similarity index 100%
rename from test/simple/test-child-process-exec-env.js
rename to test/parallel/test-child-process-exec-env.js

diff --git a/test/simple/test-child-process-exec-error.js b/test/parallel/test-child-process-exec-error.js
similarity index 100%
rename from test/simple/test-child-process-exec-error.js
rename to test/parallel/test-child-process-exec-error.js

diff --git a/test/simple/test-child-process-exit-code.js b/test/parallel/test-child-process-exit-code.js
similarity index 100%
rename from test/simple/test-child-process-exit-code.js
rename to test/parallel/test-child-process-exit-code.js

diff --git a/test/simple/test-child-process-fork-and-spawn.js b/test/parallel/test-child-process-fork-and-spawn.js
similarity index 100%
rename from test/simple/test-child-process-fork-and-spawn.js
rename to test/parallel/test-child-process-fork-and-spawn.js

diff --git a/test/simple/test-child-process-fork-close.js b/test/parallel/test-child-process-fork-close.js
similarity index 100%
rename from test/simple/test-child-process-fork-close.js
rename to test/parallel/test-child-process-fork-close.js

diff --git a/test/simple/test-child-process-fork-dgram.js b/test/parallel/test-child-process-fork-dgram.js
similarity index 100%
rename from test/simple/test-child-process-fork-dgram.js
rename to test/parallel/test-child-process-fork-dgram.js

diff --git a/test/simple/test-child-process-fork-exec-argv.js b/test/parallel/test-child-process-fork-exec-argv.js
similarity index 100%
rename from test/simple/test-child-process-fork-exec-argv.js
rename to test/parallel/test-child-process-fork-exec-argv.js

diff --git a/test/simple/test-child-process-fork-exec-path.js b/test/parallel/test-child-process-fork-exec-path.js
similarity index 100%
rename from test/simple/test-child-process-fork-exec-path.js
rename to test/parallel/test-child-process-fork-exec-path.js

diff --git a/test/simple/test-child-process-fork-net.js b/test/parallel/test-child-process-fork-net.js
similarity index 100%
rename from test/simple/test-child-process-fork-net.js
rename to test/parallel/test-child-process-fork-net.js

diff --git a/test/simple/test-child-process-fork-net2.js b/test/parallel/test-child-process-fork-net2.js
similarity index 100%
rename from test/simple/test-child-process-fork-net2.js
rename to test/parallel/test-child-process-fork-net2.js

diff --git a/test/simple/test-child-process-fork-ref.js b/test/parallel/test-child-process-fork-ref.js
similarity index 100%
rename from test/simple/test-child-process-fork-ref.js
rename to test/parallel/test-child-process-fork-ref.js

diff --git a/test/simple/test-child-process-fork-ref2.js b/test/parallel/test-child-process-fork-ref2.js
similarity index 100%
rename from test/simple/test-child-process-fork-ref2.js
rename to test/parallel/test-child-process-fork-ref2.js

diff --git a/test/simple/test-child-process-fork.js b/test/parallel/test-child-process-fork.js
similarity index 100%
rename from test/simple/test-child-process-fork.js
rename to test/parallel/test-child-process-fork.js

diff --git a/test/simple/test-child-process-fork3.js b/test/parallel/test-child-process-fork3.js
similarity index 100%
rename from test/simple/test-child-process-fork3.js
rename to test/parallel/test-child-process-fork3.js

diff --git a/test/simple/test-child-process-internal.js b/test/parallel/test-child-process-internal.js
similarity index 100%
rename from test/simple/test-child-process-internal.js
rename to test/parallel/test-child-process-internal.js

diff --git a/test/simple/test-child-process-ipc.js b/test/parallel/test-child-process-ipc.js
similarity index 100%
rename from test/simple/test-child-process-ipc.js
rename to test/parallel/test-child-process-ipc.js

diff --git a/test/simple/test-child-process-kill.js b/test/parallel/test-child-process-kill.js
similarity index 100%
rename from test/simple/test-child-process-kill.js
rename to test/parallel/test-child-process-kill.js

diff --git a/test/simple/test-child-process-recv-handle.js b/test/parallel/test-child-process-recv-handle.js
similarity index 100%
rename from test/simple/test-child-process-recv-handle.js
rename to test/parallel/test-child-process-recv-handle.js

diff --git a/test/simple/test-child-process-send-utf8.js b/test/parallel/test-child-process-send-utf8.js
similarity index 100%
rename from test/simple/test-child-process-send-utf8.js
rename to test/parallel/test-child-process-send-utf8.js

diff --git a/test/simple/test-child-process-set-blocking.js b/test/parallel/test-child-process-set-blocking.js
similarity index 100%
rename from test/simple/test-child-process-set-blocking.js
rename to test/parallel/test-child-process-set-blocking.js

diff --git a/test/simple/test-child-process-silent.js b/test/parallel/test-child-process-silent.js
similarity index 100%
rename from test/simple/test-child-process-silent.js
rename to test/parallel/test-child-process-silent.js

diff --git a/test/simple/test-child-process-spawn-error.js b/test/parallel/test-child-process-spawn-error.js
similarity index 100%
rename from test/simple/test-child-process-spawn-error.js
rename to test/parallel/test-child-process-spawn-error.js

diff --git a/test/simple/test-child-process-spawn-typeerror.js b/test/parallel/test-child-process-spawn-typeerror.js
similarity index 100%
rename from test/simple/test-child-process-spawn-typeerror.js
rename to test/parallel/test-child-process-spawn-typeerror.js

diff --git a/test/simple/test-child-process-spawnsync-env.js b/test/parallel/test-child-process-spawnsync-env.js
similarity index 100%
rename from test/simple/test-child-process-spawnsync-env.js
rename to test/parallel/test-child-process-spawnsync-env.js

diff --git a/test/simple/test-child-process-spawnsync-input.js b/test/parallel/test-child-process-spawnsync-input.js
similarity index 100%
rename from test/simple/test-child-process-spawnsync-input.js
rename to test/parallel/test-child-process-spawnsync-input.js

diff --git a/test/simple/test-child-process-spawnsync-timeout.js b/test/parallel/test-child-process-spawnsync-timeout.js
similarity index 100%
rename from test/simple/test-child-process-spawnsync-timeout.js
rename to test/parallel/test-child-process-spawnsync-timeout.js

diff --git a/test/simple/test-child-process-spawnsync.js b/test/parallel/test-child-process-spawnsync.js
similarity index 100%
rename from test/simple/test-child-process-spawnsync.js
rename to test/parallel/test-child-process-spawnsync.js

diff --git a/test/simple/test-child-process-stdin-ipc.js b/test/parallel/test-child-process-stdin-ipc.js
similarity index 100%
rename from test/simple/test-child-process-stdin-ipc.js
rename to test/parallel/test-child-process-stdin-ipc.js

diff --git a/test/simple/test-child-process-stdin.js b/test/parallel/test-child-process-stdin.js
similarity index 100%
rename from test/simple/test-child-process-stdin.js
rename to test/parallel/test-child-process-stdin.js

diff --git a/test/simple/test-child-process-stdio-big-write-end.js b/test/parallel/test-child-process-stdio-big-write-end.js
similarity index 100%
rename from test/simple/test-child-process-stdio-big-write-end.js
rename to test/parallel/test-child-process-stdio-big-write-end.js

diff --git a/test/simple/test-child-process-stdio-inherit.js b/test/parallel/test-child-process-stdio-inherit.js
similarity index 100%
rename from test/simple/test-child-process-stdio-inherit.js
rename to test/parallel/test-child-process-stdio-inherit.js

diff --git a/test/simple/test-child-process-stdio.js b/test/parallel/test-child-process-stdio.js
similarity index 100%
rename from test/simple/test-child-process-stdio.js
rename to test/parallel/test-child-process-stdio.js

diff --git a/test/simple/test-child-process-stdout-flush-exit.js b/test/parallel/test-child-process-stdout-flush-exit.js
similarity index 100%
rename from test/simple/test-child-process-stdout-flush-exit.js
rename to test/parallel/test-child-process-stdout-flush-exit.js

diff --git a/test/simple/test-child-process-stdout-flush.js b/test/parallel/test-child-process-stdout-flush.js
similarity index 100%
rename from test/simple/test-child-process-stdout-flush.js
rename to test/parallel/test-child-process-stdout-flush.js

diff --git a/test/simple/test-cli-eval.js b/test/parallel/test-cli-eval.js
similarity index 97%
rename from test/simple/test-cli-eval.js
rename to test/parallel/test-cli-eval.js
index d265601..d055ad5 100644 (file)
--- a/test/simple/test-cli-eval.js
+++ b/test/parallel/test-cli-eval.js
@@ -73,7 +73,7 @@ child.exec(nodejs + ' --eval "require(\'' + filename + '\')"',
     });
 
 // module path resolve bug, regression test
-child.exec(nodejs + ' --eval "require(\'./test/simple/test-cli-eval.js\')"',
+child.exec(nodejs + ' --eval "require(\'./test/parallel/test-cli-eval.js\')"',
     function(status, stdout, stderr) {
       assert.equal(status.code, 42);
     });

diff --git a/test/simple/test-cluster-basic.js b/test/parallel/test-cluster-basic.js
similarity index 100%
rename from test/simple/test-cluster-basic.js
rename to test/parallel/test-cluster-basic.js

diff --git a/test/simple/test-cluster-bind-privileged-port.js b/test/parallel/test-cluster-bind-privileged-port.js
similarity index 100%
rename from test/simple/test-cluster-bind-privileged-port.js
rename to test/parallel/test-cluster-bind-privileged-port.js

diff --git a/test/simple/test-cluster-bind-twice.js b/test/parallel/test-cluster-bind-twice.js
similarity index 100%
rename from test/simple/test-cluster-bind-twice.js
rename to test/parallel/test-cluster-bind-twice.js

diff --git a/test/simple/test-cluster-dgram-1.js b/test/parallel/test-cluster-dgram-1.js
similarity index 100%
rename from test/simple/test-cluster-dgram-1.js
rename to test/parallel/test-cluster-dgram-1.js

diff --git a/test/simple/test-cluster-dgram-2.js b/test/parallel/test-cluster-dgram-2.js
similarity index 100%
rename from test/simple/test-cluster-dgram-2.js
rename to test/parallel/test-cluster-dgram-2.js

diff --git a/test/simple/test-cluster-disconnect-idle-worker.js b/test/parallel/test-cluster-disconnect-idle-worker.js
similarity index 100%
rename from test/simple/test-cluster-disconnect-idle-worker.js
rename to test/parallel/test-cluster-disconnect-idle-worker.js

diff --git a/test/simple/test-cluster-disconnect-with-no-workers.js b/test/parallel/test-cluster-disconnect-with-no-workers.js
similarity index 100%
rename from test/simple/test-cluster-disconnect-with-no-workers.js
rename to test/parallel/test-cluster-disconnect-with-no-workers.js

diff --git a/test/simple/test-cluster-disconnect.js b/test/parallel/test-cluster-disconnect.js
similarity index 100%
rename from test/simple/test-cluster-disconnect.js
rename to test/parallel/test-cluster-disconnect.js

diff --git a/test/simple/test-cluster-eaccess.js b/test/parallel/test-cluster-eaccess.js
similarity index 100%
rename from test/simple/test-cluster-eaccess.js
rename to test/parallel/test-cluster-eaccess.js

diff --git a/test/simple/test-cluster-eaddrinuse.js b/test/parallel/test-cluster-eaddrinuse.js
similarity index 100%
rename from test/simple/test-cluster-eaddrinuse.js
rename to test/parallel/test-cluster-eaddrinuse.js

diff --git a/test/simple/test-cluster-fork-env.js b/test/parallel/test-cluster-fork-env.js
similarity index 100%
rename from test/simple/test-cluster-fork-env.js
rename to test/parallel/test-cluster-fork-env.js

diff --git a/test/simple/test-cluster-http-pipe.js b/test/parallel/test-cluster-http-pipe.js
similarity index 100%
rename from test/simple/test-cluster-http-pipe.js
rename to test/parallel/test-cluster-http-pipe.js

diff --git a/test/simple/test-cluster-master-error.js b/test/parallel/test-cluster-master-error.js
similarity index 100%
rename from test/simple/test-cluster-master-error.js
rename to test/parallel/test-cluster-master-error.js

diff --git a/test/simple/test-cluster-master-kill.js b/test/parallel/test-cluster-master-kill.js
similarity index 100%
rename from test/simple/test-cluster-master-kill.js
rename to test/parallel/test-cluster-master-kill.js

diff --git a/test/simple/test-cluster-message.js b/test/parallel/test-cluster-message.js
similarity index 100%
rename from test/simple/test-cluster-message.js
rename to test/parallel/test-cluster-message.js

diff --git a/test/simple/test-cluster-net-listen.js b/test/parallel/test-cluster-net-listen.js
similarity index 100%
rename from test/simple/test-cluster-net-listen.js
rename to test/parallel/test-cluster-net-listen.js

diff --git a/test/simple/test-cluster-net-send.js b/test/parallel/test-cluster-net-send.js
similarity index 100%
rename from test/simple/test-cluster-net-send.js
rename to test/parallel/test-cluster-net-send.js

diff --git a/test/simple/test-cluster-rr-domain-listen.js b/test/parallel/test-cluster-rr-domain-listen.js
similarity index 100%
rename from test/simple/test-cluster-rr-domain-listen.js
rename to test/parallel/test-cluster-rr-domain-listen.js

diff --git a/test/simple/test-cluster-send-deadlock.js b/test/parallel/test-cluster-send-deadlock.js
similarity index 100%
rename from test/simple/test-cluster-send-deadlock.js
rename to test/parallel/test-cluster-send-deadlock.js

diff --git a/test/simple/test-cluster-send-handle-twice.js b/test/parallel/test-cluster-send-handle-twice.js
similarity index 100%
rename from test/simple/test-cluster-send-handle-twice.js
rename to test/parallel/test-cluster-send-handle-twice.js

diff --git a/test/simple/test-cluster-setup-master-argv.js b/test/parallel/test-cluster-setup-master-argv.js
similarity index 100%
rename from test/simple/test-cluster-setup-master-argv.js
rename to test/parallel/test-cluster-setup-master-argv.js

diff --git a/test/simple/test-cluster-setup-master-cumulative.js b/test/parallel/test-cluster-setup-master-cumulative.js
similarity index 100%
rename from test/simple/test-cluster-setup-master-cumulative.js
rename to test/parallel/test-cluster-setup-master-cumulative.js

diff --git a/test/simple/test-cluster-setup-master-emit.js b/test/parallel/test-cluster-setup-master-emit.js
similarity index 100%
rename from test/simple/test-cluster-setup-master-emit.js
rename to test/parallel/test-cluster-setup-master-emit.js

diff --git a/test/simple/test-cluster-setup-master-multiple.js b/test/parallel/test-cluster-setup-master-multiple.js
similarity index 100%
rename from test/simple/test-cluster-setup-master-multiple.js
rename to test/parallel/test-cluster-setup-master-multiple.js

diff --git a/test/simple/test-cluster-setup-master.js b/test/parallel/test-cluster-setup-master.js
similarity index 100%
rename from test/simple/test-cluster-setup-master.js
rename to test/parallel/test-cluster-setup-master.js

diff --git a/test/simple/test-cluster-shared-handle-bind-error.js b/test/parallel/test-cluster-shared-handle-bind-error.js
similarity index 100%
rename from test/simple/test-cluster-shared-handle-bind-error.js
rename to test/parallel/test-cluster-shared-handle-bind-error.js

diff --git a/test/simple/test-cluster-shared-handle-bind-privileged-port.js b/test/parallel/test-cluster-shared-handle-bind-privileged-port.js
similarity index 100%
rename from test/simple/test-cluster-shared-handle-bind-privileged-port.js
rename to test/parallel/test-cluster-shared-handle-bind-privileged-port.js

diff --git a/test/simple/test-cluster-uncaught-exception.js b/test/parallel/test-cluster-uncaught-exception.js
similarity index 100%
rename from test/simple/test-cluster-uncaught-exception.js
rename to test/parallel/test-cluster-uncaught-exception.js

diff --git a/test/simple/test-cluster-worker-constructor.js b/test/parallel/test-cluster-worker-constructor.js
similarity index 100%
rename from test/simple/test-cluster-worker-constructor.js
rename to test/parallel/test-cluster-worker-constructor.js

diff --git a/test/simple/test-cluster-worker-death.js b/test/parallel/test-cluster-worker-death.js
similarity index 100%
rename from test/simple/test-cluster-worker-death.js
rename to test/parallel/test-cluster-worker-death.js

diff --git a/test/simple/test-cluster-worker-destroy.js b/test/parallel/test-cluster-worker-destroy.js
similarity index 100%
rename from test/simple/test-cluster-worker-destroy.js
rename to test/parallel/test-cluster-worker-destroy.js

diff --git a/test/simple/test-cluster-worker-disconnect.js b/test/parallel/test-cluster-worker-disconnect.js
similarity index 100%
rename from test/simple/test-cluster-worker-disconnect.js
rename to test/parallel/test-cluster-worker-disconnect.js

diff --git a/test/simple/test-cluster-worker-events.js b/test/parallel/test-cluster-worker-events.js
similarity index 100%
rename from test/simple/test-cluster-worker-events.js
rename to test/parallel/test-cluster-worker-events.js

diff --git a/test/simple/test-cluster-worker-exit.js b/test/parallel/test-cluster-worker-exit.js
similarity index 100%
rename from test/simple/test-cluster-worker-exit.js
rename to test/parallel/test-cluster-worker-exit.js

diff --git a/test/simple/test-cluster-worker-forced-exit.js b/test/parallel/test-cluster-worker-forced-exit.js
similarity index 100%
rename from test/simple/test-cluster-worker-forced-exit.js
rename to test/parallel/test-cluster-worker-forced-exit.js

diff --git a/test/simple/test-cluster-worker-init.js b/test/parallel/test-cluster-worker-init.js
similarity index 100%
rename from test/simple/test-cluster-worker-init.js
rename to test/parallel/test-cluster-worker-init.js

diff --git a/test/simple/test-cluster-worker-isconnected.js b/test/parallel/test-cluster-worker-isconnected.js
similarity index 100%
rename from test/simple/test-cluster-worker-isconnected.js
rename to test/parallel/test-cluster-worker-isconnected.js

diff --git a/test/simple/test-cluster-worker-isdead.js b/test/parallel/test-cluster-worker-isdead.js
similarity index 100%
rename from test/simple/test-cluster-worker-isdead.js
rename to test/parallel/test-cluster-worker-isdead.js

diff --git a/test/simple/test-cluster-worker-kill.js b/test/parallel/test-cluster-worker-kill.js
similarity index 100%
rename from test/simple/test-cluster-worker-kill.js
rename to test/parallel/test-cluster-worker-kill.js

diff --git a/test/simple/test-cluster-worker-no-exit.js b/test/parallel/test-cluster-worker-no-exit.js
similarity index 97%
rename from test/simple/test-cluster-worker-no-exit.js
rename to test/parallel/test-cluster-worker-no-exit.js
index c521fcb..8634d54 100644 (file)
--- a/test/simple/test-cluster-worker-no-exit.js
+++ b/test/parallel/test-cluster-worker-no-exit.js
@@ -22,6 +22,7 @@
 var assert = require('assert');
 var cluster = require('cluster')
 var net = require('net');
+var common = require('../common');
 
 var destroyed;
 var success;
@@ -53,7 +54,7 @@ if (cluster.isMaster) {
       success = true;
     });
 
-  }).listen(0, function() {
+  }).listen(common.PORT, function() {
     var port = this.address().port;
 
     worker = cluster.fork()

diff --git a/test/simple/test-common.js b/test/parallel/test-common.js
similarity index 100%
rename from test/simple/test-common.js
rename to test/parallel/test-common.js

diff --git a/test/simple/test-console-instance.js b/test/parallel/test-console-instance.js
similarity index 100%
rename from test/simple/test-console-instance.js
rename to test/parallel/test-console-instance.js

diff --git a/test/simple/test-console-not-call-toString.js b/test/parallel/test-console-not-call-toString.js
similarity index 100%
rename from test/simple/test-console-not-call-toString.js
rename to test/parallel/test-console-not-call-toString.js

diff --git a/test/simple/test-console.js b/test/parallel/test-console.js
similarity index 100%
rename from test/simple/test-console.js
rename to test/parallel/test-console.js

diff --git a/test/simple/test-crypto-authenticated.js b/test/parallel/test-crypto-authenticated.js
similarity index 100%
rename from test/simple/test-crypto-authenticated.js
rename to test/parallel/test-crypto-authenticated.js

diff --git a/test/simple/test-crypto-binary-default.js b/test/parallel/test-crypto-binary-default.js
similarity index 100%
rename from test/simple/test-crypto-binary-default.js
rename to test/parallel/test-crypto-binary-default.js

diff --git a/test/simple/test-crypto-certificate.js b/test/parallel/test-crypto-certificate.js
similarity index 100%
rename from test/simple/test-crypto-certificate.js
rename to test/parallel/test-crypto-certificate.js

diff --git a/test/simple/test-crypto-dh-odd-key.js b/test/parallel/test-crypto-dh-odd-key.js
similarity index 100%
rename from test/simple/test-crypto-dh-odd-key.js
rename to test/parallel/test-crypto-dh-odd-key.js

diff --git a/test/simple/test-crypto-domain.js b/test/parallel/test-crypto-domain.js
similarity index 100%
rename from test/simple/test-crypto-domain.js
rename to test/parallel/test-crypto-domain.js

diff --git a/test/simple/test-crypto-domains.js b/test/parallel/test-crypto-domains.js
similarity index 100%
rename from test/simple/test-crypto-domains.js
rename to test/parallel/test-crypto-domains.js

diff --git a/test/simple/test-crypto-ecb.js b/test/parallel/test-crypto-ecb.js
similarity index 100%
rename from test/simple/test-crypto-ecb.js
rename to test/parallel/test-crypto-ecb.js

diff --git a/test/simple/test-crypto-from-binary.js b/test/parallel/test-crypto-from-binary.js
similarity index 100%
rename from test/simple/test-crypto-from-binary.js
rename to test/parallel/test-crypto-from-binary.js

diff --git a/test/simple/test-crypto-hash-stream-pipe.js b/test/parallel/test-crypto-hash-stream-pipe.js
similarity index 100%
rename from test/simple/test-crypto-hash-stream-pipe.js
rename to test/parallel/test-crypto-hash-stream-pipe.js

diff --git a/test/simple/test-crypto-padding-aes256.js b/test/parallel/test-crypto-padding-aes256.js
similarity index 100%
rename from test/simple/test-crypto-padding-aes256.js
rename to test/parallel/test-crypto-padding-aes256.js

diff --git a/test/simple/test-crypto-padding.js b/test/parallel/test-crypto-padding.js
similarity index 100%
rename from test/simple/test-crypto-padding.js
rename to test/parallel/test-crypto-padding.js

diff --git a/test/simple/test-crypto-random.js b/test/parallel/test-crypto-random.js
similarity index 100%
rename from test/simple/test-crypto-random.js
rename to test/parallel/test-crypto-random.js

diff --git a/test/simple/test-crypto-stream.js b/test/parallel/test-crypto-stream.js
similarity index 100%
rename from test/simple/test-crypto-stream.js
rename to test/parallel/test-crypto-stream.js

diff --git a/test/simple/test-crypto-verify-failure.js b/test/parallel/test-crypto-verify-failure.js
similarity index 100%
rename from test/simple/test-crypto-verify-failure.js
rename to test/parallel/test-crypto-verify-failure.js

diff --git a/test/simple/test-crypto.js b/test/parallel/test-crypto.js
similarity index 100%
rename from test/simple/test-crypto.js
rename to test/parallel/test-crypto.js

diff --git a/test/simple/test-delayed-require.js b/test/parallel/test-delayed-require.js
similarity index 100%
rename from test/simple/test-delayed-require.js
rename to test/parallel/test-delayed-require.js

diff --git a/test/simple/test-dgram-address.js b/test/parallel/test-dgram-address.js
similarity index 100%
rename from test/simple/test-dgram-address.js
rename to test/parallel/test-dgram-address.js

diff --git a/test/simple/test-dgram-bind-default-address.js b/test/parallel/test-dgram-bind-default-address.js
similarity index 100%
rename from test/simple/test-dgram-bind-default-address.js
rename to test/parallel/test-dgram-bind-default-address.js

diff --git a/test/simple/test-dgram-bind-shared-ports.js b/test/parallel/test-dgram-bind-shared-ports.js
similarity index 100%
rename from test/simple/test-dgram-bind-shared-ports.js
rename to test/parallel/test-dgram-bind-shared-ports.js

diff --git a/test/simple/test-dgram-bind.js b/test/parallel/test-dgram-bind.js
similarity index 100%
rename from test/simple/test-dgram-bind.js
rename to test/parallel/test-dgram-bind.js

diff --git a/test/simple/test-dgram-broadcast-multi-process.js b/test/parallel/test-dgram-broadcast-multi-process.js
similarity index 100%
rename from test/simple/test-dgram-broadcast-multi-process.js
rename to test/parallel/test-dgram-broadcast-multi-process.js

diff --git a/test/simple/test-dgram-bytes-length.js b/test/parallel/test-dgram-bytes-length.js
similarity index 100%
rename from test/simple/test-dgram-bytes-length.js
rename to test/parallel/test-dgram-bytes-length.js

diff --git a/test/simple/test-dgram-close.js b/test/parallel/test-dgram-close.js
similarity index 100%
rename from test/simple/test-dgram-close.js
rename to test/parallel/test-dgram-close.js

diff --git a/test/simple/test-dgram-empty-packet.js b/test/parallel/test-dgram-empty-packet.js
similarity index 100%
rename from test/simple/test-dgram-empty-packet.js
rename to test/parallel/test-dgram-empty-packet.js

diff --git a/test/simple/test-dgram-implicit-bind.js b/test/parallel/test-dgram-implicit-bind.js
similarity index 100%
rename from test/simple/test-dgram-implicit-bind.js
rename to test/parallel/test-dgram-implicit-bind.js

diff --git a/test/simple/test-dgram-listen-after-bind.js b/test/parallel/test-dgram-listen-after-bind.js
similarity index 100%
rename from test/simple/test-dgram-listen-after-bind.js
rename to test/parallel/test-dgram-listen-after-bind.js

diff --git a/test/simple/test-dgram-msgsize.js b/test/parallel/test-dgram-msgsize.js
similarity index 100%
rename from test/simple/test-dgram-msgsize.js
rename to test/parallel/test-dgram-msgsize.js

diff --git a/test/simple/test-dgram-multicast-setTTL.js b/test/parallel/test-dgram-multicast-setTTL.js
similarity index 100%
rename from test/simple/test-dgram-multicast-setTTL.js
rename to test/parallel/test-dgram-multicast-setTTL.js

diff --git a/test/simple/test-dgram-oob-buffer.js b/test/parallel/test-dgram-oob-buffer.js
similarity index 100%
rename from test/simple/test-dgram-oob-buffer.js
rename to test/parallel/test-dgram-oob-buffer.js

diff --git a/test/simple/test-dgram-pingpong.js b/test/parallel/test-dgram-pingpong.js
similarity index 100%
rename from test/simple/test-dgram-pingpong.js
rename to test/parallel/test-dgram-pingpong.js

diff --git a/test/simple/test-dgram-ref.js b/test/parallel/test-dgram-ref.js
similarity index 100%
rename from test/simple/test-dgram-ref.js
rename to test/parallel/test-dgram-ref.js

diff --git a/test/simple/test-dgram-regress-4496.js b/test/parallel/test-dgram-regress-4496.js
similarity index 100%
rename from test/simple/test-dgram-regress-4496.js
rename to test/parallel/test-dgram-regress-4496.js

diff --git a/test/simple/test-dgram-send-bad-arguments.js b/test/parallel/test-dgram-send-bad-arguments.js
similarity index 100%
rename from test/simple/test-dgram-send-bad-arguments.js
rename to test/parallel/test-dgram-send-bad-arguments.js

diff --git a/test/simple/test-dgram-send-callback-buffer-length.js b/test/parallel/test-dgram-send-callback-buffer-length.js
similarity index 100%
rename from test/simple/test-dgram-send-callback-buffer-length.js
rename to test/parallel/test-dgram-send-callback-buffer-length.js

diff --git a/test/simple/test-dgram-send-empty-buffer.js b/test/parallel/test-dgram-send-empty-buffer.js
similarity index 100%
rename from test/simple/test-dgram-send-empty-buffer.js
rename to test/parallel/test-dgram-send-empty-buffer.js

diff --git a/test/simple/test-dgram-udp4.js b/test/parallel/test-dgram-udp4.js
similarity index 98%
rename from test/simple/test-dgram-udp4.js
rename to test/parallel/test-dgram-udp4.js
index 838c48f..cc1f1c0 100644 (file)
--- a/test/simple/test-dgram-udp4.js
+++ b/test/parallel/test-dgram-udp4.js
@@ -27,7 +27,7 @@ var assert = require('assert');
 
 var fs = require('fs'),
     dgram = require('dgram'), server, client,
-    server_port = 20989,
+    server_port = common.PORT,
     message_to_send = 'A message to send',
     timer;
 

diff --git a/test/simple/test-dgram-unref.js b/test/parallel/test-dgram-unref.js
similarity index 100%
rename from test/simple/test-dgram-unref.js
rename to test/parallel/test-dgram-unref.js

diff --git a/test/simple/test-dh-padding.js b/test/parallel/test-dh-padding.js
similarity index 100%
rename from test/simple/test-dh-padding.js
rename to test/parallel/test-dh-padding.js

diff --git a/test/simple/test-dns-cares-domains.js b/test/parallel/test-dns-cares-domains.js
similarity index 100%
rename from test/simple/test-dns-cares-domains.js
rename to test/parallel/test-dns-cares-domains.js

diff --git a/test/simple/test-dns-lookup-cb-error.js b/test/parallel/test-dns-lookup-cb-error.js
similarity index 100%
rename from test/simple/test-dns-lookup-cb-error.js
rename to test/parallel/test-dns-lookup-cb-error.js

diff --git a/test/simple/test-dns-regress-6244.js b/test/parallel/test-dns-regress-6244.js
similarity index 100%
rename from test/simple/test-dns-regress-6244.js
rename to test/parallel/test-dns-regress-6244.js

diff --git a/test/simple/test-dns-regress-7070.js b/test/parallel/test-dns-regress-7070.js
similarity index 100%
rename from test/simple/test-dns-regress-7070.js
rename to test/parallel/test-dns-regress-7070.js

diff --git a/test/simple/test-dns.js b/test/parallel/test-dns.js
similarity index 100%
rename from test/simple/test-dns.js
rename to test/parallel/test-dns.js

diff --git a/test/simple/test-domain-crypto.js b/test/parallel/test-domain-crypto.js
similarity index 100%
rename from test/simple/test-domain-crypto.js
rename to test/parallel/test-domain-crypto.js

diff --git a/test/simple/test-domain-enter-exit.js b/test/parallel/test-domain-enter-exit.js
similarity index 100%
rename from test/simple/test-domain-enter-exit.js
rename to test/parallel/test-domain-enter-exit.js

diff --git a/test/simple/test-domain-exit-dispose-again.js b/test/parallel/test-domain-exit-dispose-again.js
similarity index 100%
rename from test/simple/test-domain-exit-dispose-again.js
rename to test/parallel/test-domain-exit-dispose-again.js

diff --git a/test/simple/test-domain-exit-dispose.js b/test/parallel/test-domain-exit-dispose.js
similarity index 100%
rename from test/simple/test-domain-exit-dispose.js
rename to test/parallel/test-domain-exit-dispose.js

diff --git a/test/simple/test-domain-from-timer.js b/test/parallel/test-domain-from-timer.js
similarity index 100%
rename from test/simple/test-domain-from-timer.js
rename to test/parallel/test-domain-from-timer.js

diff --git a/test/simple/test-domain-http-server.js b/test/parallel/test-domain-http-server.js
similarity index 100%
rename from test/simple/test-domain-http-server.js
rename to test/parallel/test-domain-http-server.js

diff --git a/test/simple/test-domain-implicit-fs.js b/test/parallel/test-domain-implicit-fs.js
similarity index 100%
rename from test/simple/test-domain-implicit-fs.js
rename to test/parallel/test-domain-implicit-fs.js

diff --git a/test/simple/test-domain-multi.js b/test/parallel/test-domain-multi.js
similarity index 100%
rename from test/simple/test-domain-multi.js
rename to test/parallel/test-domain-multi.js

diff --git a/test/simple/test-domain-nested-throw.js b/test/parallel/test-domain-nested-throw.js
similarity index 100%
rename from test/simple/test-domain-nested-throw.js
rename to test/parallel/test-domain-nested-throw.js

diff --git a/test/simple/test-domain-nested.js b/test/parallel/test-domain-nested.js
similarity index 100%
rename from test/simple/test-domain-nested.js
rename to test/parallel/test-domain-nested.js

diff --git a/test/simple/test-domain-safe-exit.js b/test/parallel/test-domain-safe-exit.js
similarity index 100%
rename from test/simple/test-domain-safe-exit.js
rename to test/parallel/test-domain-safe-exit.js

diff --git a/test/simple/test-domain-stack.js b/test/parallel/test-domain-stack.js
similarity index 100%
rename from test/simple/test-domain-stack.js
rename to test/parallel/test-domain-stack.js

diff --git a/test/simple/test-domain-timers.js b/test/parallel/test-domain-timers.js
similarity index 100%
rename from test/simple/test-domain-timers.js
rename to test/parallel/test-domain-timers.js

diff --git a/test/simple/test-domain.js b/test/parallel/test-domain.js
similarity index 100%
rename from test/simple/test-domain.js
rename to test/parallel/test-domain.js

diff --git a/test/simple/test-error-reporting.js b/test/parallel/test-error-reporting.js
similarity index 100%
rename from test/simple/test-error-reporting.js
rename to test/parallel/test-error-reporting.js

diff --git a/test/simple/test-eval-require.js b/test/parallel/test-eval-require.js
similarity index 100%
rename from test/simple/test-eval-require.js
rename to test/parallel/test-eval-require.js

diff --git a/test/simple/test-eval.js b/test/parallel/test-eval.js
similarity index 100%
rename from test/simple/test-eval.js
rename to test/parallel/test-eval.js

diff --git a/test/simple/test-event-emitter-add-listeners.js b/test/parallel/test-event-emitter-add-listeners.js
similarity index 100%
rename from test/simple/test-event-emitter-add-listeners.js
rename to test/parallel/test-event-emitter-add-listeners.js

diff --git a/test/simple/test-event-emitter-check-listener-leaks.js b/test/parallel/test-event-emitter-check-listener-leaks.js
similarity index 100%
rename from test/simple/test-event-emitter-check-listener-leaks.js
rename to test/parallel/test-event-emitter-check-listener-leaks.js

diff --git a/test/simple/test-event-emitter-get-max-listeners.js b/test/parallel/test-event-emitter-get-max-listeners.js
similarity index 100%
rename from test/simple/test-event-emitter-get-max-listeners.js
rename to test/parallel/test-event-emitter-get-max-listeners.js

diff --git a/test/simple/test-event-emitter-listeners-side-effects.js b/test/parallel/test-event-emitter-listeners-side-effects.js
similarity index 100%
rename from test/simple/test-event-emitter-listeners-side-effects.js
rename to test/parallel/test-event-emitter-listeners-side-effects.js

diff --git a/test/simple/test-event-emitter-listeners.js b/test/parallel/test-event-emitter-listeners.js
similarity index 100%
rename from test/simple/test-event-emitter-listeners.js
rename to test/parallel/test-event-emitter-listeners.js

diff --git a/test/simple/test-event-emitter-max-listeners.js b/test/parallel/test-event-emitter-max-listeners.js
similarity index 100%
rename from test/simple/test-event-emitter-max-listeners.js
rename to test/parallel/test-event-emitter-max-listeners.js

diff --git a/test/simple/test-event-emitter-method-names.js b/test/parallel/test-event-emitter-method-names.js
similarity index 100%
rename from test/simple/test-event-emitter-method-names.js
rename to test/parallel/test-event-emitter-method-names.js

diff --git a/test/simple/test-event-emitter-modify-in-emit.js b/test/parallel/test-event-emitter-modify-in-emit.js
similarity index 100%
rename from test/simple/test-event-emitter-modify-in-emit.js
rename to test/parallel/test-event-emitter-modify-in-emit.js

diff --git a/test/simple/test-event-emitter-no-error-provided-to-error-event.js b/test/parallel/test-event-emitter-no-error-provided-to-error-event.js
similarity index 100%
rename from test/simple/test-event-emitter-no-error-provided-to-error-event.js
rename to test/parallel/test-event-emitter-no-error-provided-to-error-event.js

diff --git a/test/simple/test-event-emitter-num-args.js b/test/parallel/test-event-emitter-num-args.js
similarity index 100%
rename from test/simple/test-event-emitter-num-args.js
rename to test/parallel/test-event-emitter-num-args.js

diff --git a/test/simple/test-event-emitter-once.js b/test/parallel/test-event-emitter-once.js
similarity index 100%
rename from test/simple/test-event-emitter-once.js
rename to test/parallel/test-event-emitter-once.js

diff --git a/test/simple/test-event-emitter-remove-all-listeners.js b/test/parallel/test-event-emitter-remove-all-listeners.js
similarity index 100%
rename from test/simple/test-event-emitter-remove-all-listeners.js
rename to test/parallel/test-event-emitter-remove-all-listeners.js

diff --git a/test/simple/test-event-emitter-remove-listeners.js b/test/parallel/test-event-emitter-remove-listeners.js
similarity index 100%
rename from test/simple/test-event-emitter-remove-listeners.js
rename to test/parallel/test-event-emitter-remove-listeners.js

diff --git a/test/simple/test-event-emitter-set-max-listeners-side-effects.js b/test/parallel/test-event-emitter-set-max-listeners-side-effects.js
similarity index 100%
rename from test/simple/test-event-emitter-set-max-listeners-side-effects.js
rename to test/parallel/test-event-emitter-set-max-listeners-side-effects.js

diff --git a/test/simple/test-event-emitter-subclass.js b/test/parallel/test-event-emitter-subclass.js
similarity index 100%
rename from test/simple/test-event-emitter-subclass.js
rename to test/parallel/test-event-emitter-subclass.js

diff --git a/test/simple/test-exception-handler.js b/test/parallel/test-exception-handler.js
similarity index 100%
rename from test/simple/test-exception-handler.js
rename to test/parallel/test-exception-handler.js

diff --git a/test/simple/test-exception-handler2.js b/test/parallel/test-exception-handler2.js
similarity index 100%
rename from test/simple/test-exception-handler2.js
rename to test/parallel/test-exception-handler2.js

diff --git a/test/simple/test-exec-max-buffer.js b/test/parallel/test-exec-max-buffer.js
similarity index 100%
rename from test/simple/test-exec-max-buffer.js
rename to test/parallel/test-exec-max-buffer.js

diff --git a/test/simple/test-file-read-noexist.js b/test/parallel/test-file-read-noexist.js
similarity index 100%
rename from test/simple/test-file-read-noexist.js
rename to test/parallel/test-file-read-noexist.js

diff --git a/test/simple/test-file-write-stream.js b/test/parallel/test-file-write-stream.js
similarity index 100%
rename from test/simple/test-file-write-stream.js
rename to test/parallel/test-file-write-stream.js

diff --git a/test/simple/test-file-write-stream2.js b/test/parallel/test-file-write-stream2.js
similarity index 100%
rename from test/simple/test-file-write-stream2.js
rename to test/parallel/test-file-write-stream2.js

diff --git a/test/simple/test-file-write-stream3.js b/test/parallel/test-file-write-stream3.js
similarity index 100%
rename from test/simple/test-file-write-stream3.js
rename to test/parallel/test-file-write-stream3.js

diff --git a/test/simple/test-fs-access.js b/test/parallel/test-fs-access.js
similarity index 100%
rename from test/simple/test-fs-access.js
rename to test/parallel/test-fs-access.js

diff --git a/test/simple/test-fs-append-file-sync.js b/test/parallel/test-fs-append-file-sync.js
similarity index 100%
rename from test/simple/test-fs-append-file-sync.js
rename to test/parallel/test-fs-append-file-sync.js

diff --git a/test/simple/test-fs-append-file.js b/test/parallel/test-fs-append-file.js
similarity index 100%
rename from test/simple/test-fs-append-file.js
rename to test/parallel/test-fs-append-file.js

diff --git a/test/simple/test-fs-chmod.js b/test/parallel/test-fs-chmod.js
similarity index 100%
rename from test/simple/test-fs-chmod.js
rename to test/parallel/test-fs-chmod.js

diff --git a/test/simple/test-fs-empty-readStream.js b/test/parallel/test-fs-empty-readStream.js
similarity index 100%
rename from test/simple/test-fs-empty-readStream.js
rename to test/parallel/test-fs-empty-readStream.js

diff --git a/test/simple/test-fs-error-messages.js b/test/parallel/test-fs-error-messages.js
similarity index 100%
rename from test/simple/test-fs-error-messages.js
rename to test/parallel/test-fs-error-messages.js

diff --git a/test/simple/test-fs-exists.js b/test/parallel/test-fs-exists.js
similarity index 100%
rename from test/simple/test-fs-exists.js
rename to test/parallel/test-fs-exists.js

diff --git a/test/simple/test-fs-fsync.js b/test/parallel/test-fs-fsync.js
similarity index 100%
rename from test/simple/test-fs-fsync.js
rename to test/parallel/test-fs-fsync.js

diff --git a/test/simple/test-fs-long-path.js b/test/parallel/test-fs-long-path.js
similarity index 100%
rename from test/simple/test-fs-long-path.js
rename to test/parallel/test-fs-long-path.js

diff --git a/test/simple/test-fs-mkdir.js b/test/parallel/test-fs-mkdir.js
similarity index 100%
rename from test/simple/test-fs-mkdir.js
rename to test/parallel/test-fs-mkdir.js

diff --git a/test/simple/test-fs-non-number-arguments-throw.js b/test/parallel/test-fs-non-number-arguments-throw.js
similarity index 100%
rename from test/simple/test-fs-non-number-arguments-throw.js
rename to test/parallel/test-fs-non-number-arguments-throw.js

diff --git a/test/simple/test-fs-null-bytes.js b/test/parallel/test-fs-null-bytes.js
similarity index 100%
rename from test/simple/test-fs-null-bytes.js
rename to test/parallel/test-fs-null-bytes.js

diff --git a/test/simple/test-fs-open-flags.js b/test/parallel/test-fs-open-flags.js
similarity index 100%
rename from test/simple/test-fs-open-flags.js
rename to test/parallel/test-fs-open-flags.js

diff --git a/test/simple/test-fs-open.js b/test/parallel/test-fs-open.js
similarity index 100%
rename from test/simple/test-fs-open.js
rename to test/parallel/test-fs-open.js

diff --git a/test/simple/test-fs-read-buffer.js b/test/parallel/test-fs-read-buffer.js
similarity index 100%
rename from test/simple/test-fs-read-buffer.js
rename to test/parallel/test-fs-read-buffer.js

diff --git a/test/simple/test-fs-read-file-sync-hostname.js b/test/parallel/test-fs-read-file-sync-hostname.js
similarity index 100%
rename from test/simple/test-fs-read-file-sync-hostname.js
rename to test/parallel/test-fs-read-file-sync-hostname.js

diff --git a/test/simple/test-fs-read-file-sync.js b/test/parallel/test-fs-read-file-sync.js
similarity index 100%
rename from test/simple/test-fs-read-file-sync.js
rename to test/parallel/test-fs-read-file-sync.js

diff --git a/test/simple/test-fs-read-stream-err.js b/test/parallel/test-fs-read-stream-err.js
similarity index 100%
rename from test/simple/test-fs-read-stream-err.js
rename to test/parallel/test-fs-read-stream-err.js

diff --git a/test/simple/test-fs-read-stream-fd.js b/test/parallel/test-fs-read-stream-fd.js
similarity index 100%
rename from test/simple/test-fs-read-stream-fd.js
rename to test/parallel/test-fs-read-stream-fd.js

diff --git a/test/simple/test-fs-read-stream-resume.js b/test/parallel/test-fs-read-stream-resume.js
similarity index 100%
rename from test/simple/test-fs-read-stream-resume.js
rename to test/parallel/test-fs-read-stream-resume.js

diff --git a/test/simple/test-fs-read-stream.js b/test/parallel/test-fs-read-stream.js
similarity index 100%
rename from test/simple/test-fs-read-stream.js
rename to test/parallel/test-fs-read-stream.js

diff --git a/test/simple/test-fs-read.js b/test/parallel/test-fs-read.js
similarity index 100%
rename from test/simple/test-fs-read.js
rename to test/parallel/test-fs-read.js

diff --git a/test/simple/test-fs-readfile-empty.js b/test/parallel/test-fs-readfile-empty.js
similarity index 100%
rename from test/simple/test-fs-readfile-empty.js
rename to test/parallel/test-fs-readfile-empty.js

diff --git a/test/simple/test-fs-readfile-error.js b/test/parallel/test-fs-readfile-error.js
similarity index 100%
rename from test/simple/test-fs-readfile-error.js
rename to test/parallel/test-fs-readfile-error.js

diff --git a/test/simple/test-fs-readfile-pipe.js b/test/parallel/test-fs-readfile-pipe.js
similarity index 100%
rename from test/simple/test-fs-readfile-pipe.js
rename to test/parallel/test-fs-readfile-pipe.js

diff --git a/test/simple/test-fs-readfile-unlink.js b/test/parallel/test-fs-readfile-unlink.js
similarity index 100%
rename from test/simple/test-fs-readfile-unlink.js
rename to test/parallel/test-fs-readfile-unlink.js

diff --git a/test/simple/test-fs-readfile-zero-byte-liar.js b/test/parallel/test-fs-readfile-zero-byte-liar.js
similarity index 100%
rename from test/simple/test-fs-readfile-zero-byte-liar.js
rename to test/parallel/test-fs-readfile-zero-byte-liar.js

diff --git a/test/simple/test-fs-realpath.js b/test/parallel/test-fs-realpath.js
similarity index 98%
rename from test/simple/test-fs-realpath.js
rename to test/parallel/test-fs-realpath.js
index 0c82090..9b02ae7 100644 (file)
--- a/test/simple/test-fs-realpath.js
+++ b/test/parallel/test-fs-realpath.js
@@ -103,7 +103,7 @@ function test_simple_relative_symlink(callback) {
   var entry = common.tmpDir + '/symlink',
       expected = common.tmpDir + '/cycles/root.js';
   [
-    [entry, '../tmp/cycles/root.js']
+    [entry, '../' + common.tmpDirName + '/cycles/root.js']
   ].forEach(function(t) {
     try {fs.unlinkSync(t[0]);}catch (e) {}
     console.log('fs.symlinkSync(%j, %j, %j)', t[1], t[0], 'file');
@@ -335,15 +335,16 @@ function test_deep_symlink_mix(callback) {
   fs.mkdirSync(tmp('node-test-realpath-d2'), 0700);
   try {
     [
-      [entry, '../tmp/node-test-realpath-d1/foo'],
-      [tmp('node-test-realpath-d1'), '../tmp/node-test-realpath-d2'],
+      [entry, '../' + common.tmpDirName + '/node-test-realpath-d1/foo'],
+      [tmp('node-test-realpath-d1'),
+          '../' + common.tmpDirName + '/node-test-realpath-d2'],
       [tmp('node-test-realpath-d2/foo'), '../node-test-realpath-f2'],
       [tmp('node-test-realpath-f2'), fixturesAbsDir +
            '/nested-index/one/realpath-c'],
       [fixturesAbsDir + '/nested-index/one/realpath-c', fixturesAbsDir +
             '/nested-index/two/realpath-c'],
       [fixturesAbsDir + '/nested-index/two/realpath-c',
-        '../../../tmp/cycles/root.js']
+        '../../../' + common.tmpDirName + '/cycles/root.js']
     ].forEach(function(t) {
       //common.debug('setting up '+t[0]+' -> '+t[1]);
       try { fs.unlinkSync(t[0]); } catch (e) {}

diff --git a/test/simple/test-fs-sir-writes-alot.js b/test/parallel/test-fs-sir-writes-alot.js
similarity index 100%
rename from test/simple/test-fs-sir-writes-alot.js
rename to test/parallel/test-fs-sir-writes-alot.js

diff --git a/test/simple/test-fs-stat.js b/test/parallel/test-fs-stat.js
similarity index 100%
rename from test/simple/test-fs-stat.js
rename to test/parallel/test-fs-stat.js

diff --git a/test/simple/test-fs-stream-double-close.js b/test/parallel/test-fs-stream-double-close.js
similarity index 100%
rename from test/simple/test-fs-stream-double-close.js
rename to test/parallel/test-fs-stream-double-close.js

diff --git a/test/simple/test-fs-symlink-dir-junction-relative.js b/test/parallel/test-fs-symlink-dir-junction-relative.js
similarity index 100%
rename from test/simple/test-fs-symlink-dir-junction-relative.js
rename to test/parallel/test-fs-symlink-dir-junction-relative.js

diff --git a/test/simple/test-fs-symlink-dir-junction.js b/test/parallel/test-fs-symlink-dir-junction.js
similarity index 100%
rename from test/simple/test-fs-symlink-dir-junction.js
rename to test/parallel/test-fs-symlink-dir-junction.js

diff --git a/test/simple/test-fs-symlink.js b/test/parallel/test-fs-symlink.js
similarity index 100%
rename from test/simple/test-fs-symlink.js
rename to test/parallel/test-fs-symlink.js

diff --git a/test/simple/test-fs-sync-fd-leak.js b/test/parallel/test-fs-sync-fd-leak.js
similarity index 100%
rename from test/simple/test-fs-sync-fd-leak.js
rename to test/parallel/test-fs-sync-fd-leak.js

diff --git a/test/simple/test-fs-truncate-GH-6233.js b/test/parallel/test-fs-truncate-GH-6233.js
similarity index 100%
rename from test/simple/test-fs-truncate-GH-6233.js
rename to test/parallel/test-fs-truncate-GH-6233.js

diff --git a/test/simple/test-fs-truncate.js b/test/parallel/test-fs-truncate.js
similarity index 100%
rename from test/simple/test-fs-truncate.js
rename to test/parallel/test-fs-truncate.js

diff --git a/test/simple/test-fs-utimes.js b/test/parallel/test-fs-utimes.js
similarity index 100%
rename from test/simple/test-fs-utimes.js
rename to test/parallel/test-fs-utimes.js

diff --git a/test/simple/test-fs-write-buffer.js b/test/parallel/test-fs-write-buffer.js
similarity index 100%
rename from test/simple/test-fs-write-buffer.js
rename to test/parallel/test-fs-write-buffer.js

diff --git a/test/simple/test-fs-write-file-buffer.js b/test/parallel/test-fs-write-file-buffer.js
similarity index 100%
rename from test/simple/test-fs-write-file-buffer.js
rename to test/parallel/test-fs-write-file-buffer.js

diff --git a/test/simple/test-fs-write-file-sync.js b/test/parallel/test-fs-write-file-sync.js
similarity index 100%
rename from test/simple/test-fs-write-file-sync.js
rename to test/parallel/test-fs-write-file-sync.js

diff --git a/test/simple/test-fs-write-file.js b/test/parallel/test-fs-write-file.js
similarity index 100%
rename from test/simple/test-fs-write-file.js
rename to test/parallel/test-fs-write-file.js

diff --git a/test/simple/test-fs-write-stream-change-open.js b/test/parallel/test-fs-write-stream-change-open.js
similarity index 100%
rename from test/simple/test-fs-write-stream-change-open.js
rename to test/parallel/test-fs-write-stream-change-open.js

diff --git a/test/simple/test-fs-write-stream-end.js b/test/parallel/test-fs-write-stream-end.js
similarity index 100%
rename from test/simple/test-fs-write-stream-end.js
rename to test/parallel/test-fs-write-stream-end.js

diff --git a/test/simple/test-fs-write-stream-err.js b/test/parallel/test-fs-write-stream-err.js
similarity index 100%
rename from test/simple/test-fs-write-stream-err.js
rename to test/parallel/test-fs-write-stream-err.js

diff --git a/test/simple/test-fs-write-stream.js b/test/parallel/test-fs-write-stream.js
similarity index 100%
rename from test/simple/test-fs-write-stream.js
rename to test/parallel/test-fs-write-stream.js

diff --git a/test/simple/test-fs-write-sync.js b/test/parallel/test-fs-write-sync.js
similarity index 100%
rename from test/simple/test-fs-write-sync.js
rename to test/parallel/test-fs-write-sync.js

diff --git a/test/simple/test-fs-write.js b/test/parallel/test-fs-write.js
similarity index 100%
rename from test/simple/test-fs-write.js
rename to test/parallel/test-fs-write.js

diff --git a/test/simple/test-global.js b/test/parallel/test-global.js
similarity index 100%
rename from test/simple/test-global.js
rename to test/parallel/test-global.js

diff --git a/test/simple/test-handle-wrap-close-abort.js b/test/parallel/test-handle-wrap-close-abort.js
similarity index 100%
rename from test/simple/test-handle-wrap-close-abort.js
rename to test/parallel/test-handle-wrap-close-abort.js

diff --git a/test/simple/test-http-1.0-keep-alive.js b/test/parallel/test-http-1.0-keep-alive.js
similarity index 100%
rename from test/simple/test-http-1.0-keep-alive.js
rename to test/parallel/test-http-1.0-keep-alive.js

diff --git a/test/simple/test-http-1.0.js b/test/parallel/test-http-1.0.js
similarity index 100%
rename from test/simple/test-http-1.0.js
rename to test/parallel/test-http-1.0.js

diff --git a/test/simple/test-http-304.js b/test/parallel/test-http-304.js
similarity index 100%
rename from test/simple/test-http-304.js
rename to test/parallel/test-http-304.js

diff --git a/test/simple/test-http-abort-before-end.js b/test/parallel/test-http-abort-before-end.js
similarity index 100%
rename from test/simple/test-http-abort-before-end.js
rename to test/parallel/test-http-abort-before-end.js

diff --git a/test/simple/test-http-abort-client.js b/test/parallel/test-http-abort-client.js
similarity index 100%
rename from test/simple/test-http-abort-client.js
rename to test/parallel/test-http-abort-client.js

diff --git a/test/simple/test-http-abort-queued.js b/test/parallel/test-http-abort-queued.js
similarity index 97%
rename from test/simple/test-http-abort-queued.js
rename to test/parallel/test-http-abort-queued.js
index d3ec5a1..6d83cd4 100644 (file)
--- a/test/simple/test-http-abort-queued.js
+++ b/test/parallel/test-http-abort-queued.js
@@ -20,6 +20,7 @@
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 var assert = require('assert'),
+    common = require('../common'),
     http = require('http');
 
 var complete;
@@ -38,7 +39,7 @@ var server = http.createServer(function (req, res) {
 });
 
 
-server.listen(0, function () {
+server.listen(common.PORT, function () {
   console.log('listen', server.address().port);
 
   var agent = new http.Agent({maxSockets: 1});

diff --git a/test/simple/test-http-after-connect.js b/test/parallel/test-http-after-connect.js
similarity index 100%
rename from test/simple/test-http-after-connect.js
rename to test/parallel/test-http-after-connect.js

diff --git a/test/simple/test-http-agent-destroyed-socket.js b/test/parallel/test-http-agent-destroyed-socket.js
similarity index 100%
rename from test/simple/test-http-agent-destroyed-socket.js
rename to test/parallel/test-http-agent-destroyed-socket.js

diff --git a/test/simple/test-http-agent-false.js b/test/parallel/test-http-agent-false.js
similarity index 100%
rename from test/simple/test-http-agent-false.js
rename to test/parallel/test-http-agent-false.js

diff --git a/test/simple/test-http-agent-keepalive.js b/test/parallel/test-http-agent-keepalive.js
similarity index 100%
rename from test/simple/test-http-agent-keepalive.js
rename to test/parallel/test-http-agent-keepalive.js

diff --git a/test/simple/test-http-agent-no-protocol.js b/test/parallel/test-http-agent-no-protocol.js
similarity index 100%
rename from test/simple/test-http-agent-no-protocol.js
rename to test/parallel/test-http-agent-no-protocol.js

diff --git a/test/simple/test-http-agent-null.js b/test/parallel/test-http-agent-null.js
similarity index 97%
rename from test/simple/test-http-agent-null.js
rename to test/parallel/test-http-agent-null.js
index 8ae71d5..3f49cec 100644 (file)
--- a/test/simple/test-http-agent-null.js
+++ b/test/parallel/test-http-agent-null.js
@@ -34,7 +34,7 @@ process.on('exit', function() {
 var server = http.createServer(function(req, res) {
   request++;
   res.end();
-}).listen(function() {
+}).listen(common.PORT, function() {
   var options = {
     agent: null,
     port: this.address().port

diff --git a/test/simple/test-http-agent.js b/test/parallel/test-http-agent.js
similarity index 100%
rename from test/simple/test-http-agent.js
rename to test/parallel/test-http-agent.js

diff --git a/test/simple/test-http-allow-req-after-204-res.js b/test/parallel/test-http-allow-req-after-204-res.js
similarity index 100%
rename from test/simple/test-http-allow-req-after-204-res.js
rename to test/parallel/test-http-allow-req-after-204-res.js

diff --git a/test/simple/test-http-bind-twice.js b/test/parallel/test-http-bind-twice.js
similarity index 100%
rename from test/simple/test-http-bind-twice.js
rename to test/parallel/test-http-bind-twice.js

diff --git a/test/simple/test-http-blank-header.js b/test/parallel/test-http-blank-header.js
similarity index 100%
rename from test/simple/test-http-blank-header.js
rename to test/parallel/test-http-blank-header.js

diff --git a/test/simple/test-http-buffer-sanity.js b/test/parallel/test-http-buffer-sanity.js
similarity index 100%
rename from test/simple/test-http-buffer-sanity.js
rename to test/parallel/test-http-buffer-sanity.js

diff --git a/test/simple/test-http-byteswritten.js b/test/parallel/test-http-byteswritten.js
similarity index 100%
rename from test/simple/test-http-byteswritten.js
rename to test/parallel/test-http-byteswritten.js

diff --git a/test/simple/test-http-chunked-304.js b/test/parallel/test-http-chunked-304.js
similarity index 100%
rename from test/simple/test-http-chunked-304.js
rename to test/parallel/test-http-chunked-304.js

diff --git a/test/simple/test-http-chunked.js b/test/parallel/test-http-chunked.js
similarity index 100%
rename from test/simple/test-http-chunked.js
rename to test/parallel/test-http-chunked.js

diff --git a/test/simple/test-http-client-abort.js b/test/parallel/test-http-client-abort.js
similarity index 100%
rename from test/simple/test-http-client-abort.js
rename to test/parallel/test-http-client-abort.js

diff --git a/test/simple/test-http-client-abort2.js b/test/parallel/test-http-client-abort2.js
similarity index 100%
rename from test/simple/test-http-client-abort2.js
rename to test/parallel/test-http-client-abort2.js

diff --git a/test/simple/test-http-client-agent.js b/test/parallel/test-http-client-agent.js
similarity index 100%
rename from test/simple/test-http-client-agent.js
rename to test/parallel/test-http-client-agent.js

diff --git a/test/simple/test-http-client-default-headers-exist.js b/test/parallel/test-http-client-default-headers-exist.js
similarity index 100%
rename from test/simple/test-http-client-default-headers-exist.js
rename to test/parallel/test-http-client-default-headers-exist.js

diff --git a/test/simple/test-http-client-encoding.js b/test/parallel/test-http-client-encoding.js
similarity index 100%
rename from test/simple/test-http-client-encoding.js
rename to test/parallel/test-http-client-encoding.js

diff --git a/test/simple/test-http-client-get-url.js b/test/parallel/test-http-client-get-url.js
similarity index 100%
rename from test/simple/test-http-client-get-url.js
rename to test/parallel/test-http-client-get-url.js

diff --git a/test/simple/test-http-client-parse-error.js b/test/parallel/test-http-client-parse-error.js
similarity index 100%
rename from test/simple/test-http-client-parse-error.js
rename to test/parallel/test-http-client-parse-error.js

diff --git a/test/simple/test-http-client-pipe-end.js b/test/parallel/test-http-client-pipe-end.js
similarity index 100%
rename from test/simple/test-http-client-pipe-end.js
rename to test/parallel/test-http-client-pipe-end.js

diff --git a/test/simple/test-http-client-race-2.js b/test/parallel/test-http-client-race-2.js
similarity index 100%
rename from test/simple/test-http-client-race-2.js
rename to test/parallel/test-http-client-race-2.js

diff --git a/test/simple/test-http-client-race.js b/test/parallel/test-http-client-race.js
similarity index 100%
rename from test/simple/test-http-client-race.js
rename to test/parallel/test-http-client-race.js

diff --git a/test/simple/test-http-client-readable.js b/test/parallel/test-http-client-readable.js
similarity index 100%
rename from test/simple/test-http-client-readable.js
rename to test/parallel/test-http-client-readable.js

diff --git a/test/simple/test-http-client-response-domain.js b/test/parallel/test-http-client-response-domain.js
similarity index 100%
rename from test/simple/test-http-client-response-domain.js
rename to test/parallel/test-http-client-response-domain.js

diff --git a/test/simple/test-http-client-timeout-agent.js b/test/parallel/test-http-client-timeout-agent.js
similarity index 100%
rename from test/simple/test-http-client-timeout-agent.js
rename to test/parallel/test-http-client-timeout-agent.js

diff --git a/test/simple/test-http-client-timeout-event.js b/test/parallel/test-http-client-timeout-event.js
similarity index 100%
rename from test/simple/test-http-client-timeout-event.js
rename to test/parallel/test-http-client-timeout-event.js

diff --git a/test/simple/test-http-client-timeout-with-data.js b/test/parallel/test-http-client-timeout-with-data.js
similarity index 100%
rename from test/simple/test-http-client-timeout-with-data.js
rename to test/parallel/test-http-client-timeout-with-data.js

diff --git a/test/simple/test-http-client-timeout.js b/test/parallel/test-http-client-timeout.js
similarity index 100%
rename from test/simple/test-http-client-timeout.js
rename to test/parallel/test-http-client-timeout.js

diff --git a/test/simple/test-http-client-unescaped-path.js b/test/parallel/test-http-client-unescaped-path.js
similarity index 100%
rename from test/simple/test-http-client-unescaped-path.js
rename to test/parallel/test-http-client-unescaped-path.js

diff --git a/test/simple/test-http-client-upload-buf.js b/test/parallel/test-http-client-upload-buf.js
similarity index 100%
rename from test/simple/test-http-client-upload-buf.js
rename to test/parallel/test-http-client-upload-buf.js

diff --git a/test/simple/test-http-client-upload.js b/test/parallel/test-http-client-upload.js
similarity index 100%
rename from test/simple/test-http-client-upload.js
rename to test/parallel/test-http-client-upload.js

diff --git a/test/simple/test-http-conn-reset.js b/test/parallel/test-http-conn-reset.js
similarity index 100%
rename from test/simple/test-http-conn-reset.js
rename to test/parallel/test-http-conn-reset.js

diff --git a/test/simple/test-http-connect.js b/test/parallel/test-http-connect.js
similarity index 100%
rename from test/simple/test-http-connect.js
rename to test/parallel/test-http-connect.js

diff --git a/test/simple/test-http-contentLength0.js b/test/parallel/test-http-contentLength0.js
similarity index 100%
rename from test/simple/test-http-contentLength0.js
rename to test/parallel/test-http-contentLength0.js

diff --git a/test/simple/test-http-createConnection.js b/test/parallel/test-http-createConnection.js
similarity index 100%
rename from test/simple/test-http-createConnection.js
rename to test/parallel/test-http-createConnection.js

diff --git a/test/simple/test-http-curl-chunk-problem.js b/test/parallel/test-http-curl-chunk-problem.js
similarity index 100%
rename from test/simple/test-http-curl-chunk-problem.js
rename to test/parallel/test-http-curl-chunk-problem.js

diff --git a/test/simple/test-http-date-header.js b/test/parallel/test-http-date-header.js
similarity index 100%
rename from test/simple/test-http-date-header.js
rename to test/parallel/test-http-date-header.js

diff --git a/test/simple/test-http-default-encoding.js b/test/parallel/test-http-default-encoding.js
similarity index 100%
rename from test/simple/test-http-default-encoding.js
rename to test/parallel/test-http-default-encoding.js

diff --git a/test/simple/test-http-default-port.js b/test/parallel/test-http-default-port.js
similarity index 100%
rename from test/simple/test-http-default-port.js
rename to test/parallel/test-http-default-port.js

diff --git a/test/simple/test-http-destroyed-socket-write2.js b/test/parallel/test-http-destroyed-socket-write2.js
similarity index 100%
rename from test/simple/test-http-destroyed-socket-write2.js
rename to test/parallel/test-http-destroyed-socket-write2.js

diff --git a/test/simple/test-http-dns-error.js b/test/parallel/test-http-dns-error.js
similarity index 100%
rename from test/simple/test-http-dns-error.js
rename to test/parallel/test-http-dns-error.js

diff --git a/test/simple/test-http-end-throw-socket-handling.js b/test/parallel/test-http-end-throw-socket-handling.js
similarity index 100%
rename from test/simple/test-http-end-throw-socket-handling.js
rename to test/parallel/test-http-end-throw-socket-handling.js

diff --git a/test/simple/test-http-eof-on-connect.js b/test/parallel/test-http-eof-on-connect.js
similarity index 100%
rename from test/simple/test-http-eof-on-connect.js
rename to test/parallel/test-http-eof-on-connect.js

diff --git a/test/simple/test-http-exceptions.js b/test/parallel/test-http-exceptions.js
similarity index 100%
rename from test/simple/test-http-exceptions.js
rename to test/parallel/test-http-exceptions.js

diff --git a/test/simple/test-http-exit-delay.js b/test/parallel/test-http-exit-delay.js
similarity index 100%
rename from test/simple/test-http-exit-delay.js
rename to test/parallel/test-http-exit-delay.js

diff --git a/test/simple/test-http-expect-continue.js b/test/parallel/test-http-expect-continue.js
similarity index 100%
rename from test/simple/test-http-expect-continue.js
rename to test/parallel/test-http-expect-continue.js

diff --git a/test/simple/test-http-extra-response.js b/test/parallel/test-http-extra-response.js
similarity index 100%
rename from test/simple/test-http-extra-response.js
rename to test/parallel/test-http-extra-response.js

diff --git a/test/simple/test-http-flush.js b/test/parallel/test-http-flush.js
similarity index 100%
rename from test/simple/test-http-flush.js
rename to test/parallel/test-http-flush.js

diff --git a/test/simple/test-http-full-response.js b/test/parallel/test-http-full-response.js
similarity index 100%
rename from test/simple/test-http-full-response.js
rename to test/parallel/test-http-full-response.js

diff --git a/test/simple/test-http-get-pipeline-problem.js b/test/parallel/test-http-get-pipeline-problem.js
similarity index 100%
rename from test/simple/test-http-get-pipeline-problem.js
rename to test/parallel/test-http-get-pipeline-problem.js

diff --git a/test/simple/test-http-head-request.js b/test/parallel/test-http-head-request.js
similarity index 100%
rename from test/simple/test-http-head-request.js
rename to test/parallel/test-http-head-request.js

diff --git a/test/simple/test-http-head-response-has-no-body-end.js b/test/parallel/test-http-head-response-has-no-body-end.js
similarity index 100%
rename from test/simple/test-http-head-response-has-no-body-end.js
rename to test/parallel/test-http-head-response-has-no-body-end.js

diff --git a/test/simple/test-http-head-response-has-no-body.js b/test/parallel/test-http-head-response-has-no-body.js
similarity index 100%
rename from test/simple/test-http-head-response-has-no-body.js
rename to test/parallel/test-http-head-response-has-no-body.js

diff --git a/test/simple/test-http-header-read.js b/test/parallel/test-http-header-read.js
similarity index 100%
rename from test/simple/test-http-header-read.js
rename to test/parallel/test-http-header-read.js

diff --git a/test/simple/test-http-header-response-splitting.js b/test/parallel/test-http-header-response-splitting.js
similarity index 100%
rename from test/simple/test-http-header-response-splitting.js
rename to test/parallel/test-http-header-response-splitting.js

diff --git a/test/simple/test-http-hex-write.js b/test/parallel/test-http-hex-write.js
similarity index 100%
rename from test/simple/test-http-hex-write.js
rename to test/parallel/test-http-hex-write.js

diff --git a/test/simple/test-http-host-headers.js b/test/parallel/test-http-host-headers.js
similarity index 100%
rename from test/simple/test-http-host-headers.js
rename to test/parallel/test-http-host-headers.js

diff --git a/test/simple/test-http-incoming-pipelined-socket-destroy.js b/test/parallel/test-http-incoming-pipelined-socket-destroy.js
similarity index 100%
rename from test/simple/test-http-incoming-pipelined-socket-destroy.js
rename to test/parallel/test-http-incoming-pipelined-socket-destroy.js

diff --git a/test/simple/test-http-keep-alive-close-on-header.js b/test/parallel/test-http-keep-alive-close-on-header.js
similarity index 100%
rename from test/simple/test-http-keep-alive-close-on-header.js
rename to test/parallel/test-http-keep-alive-close-on-header.js

diff --git a/test/simple/test-http-keep-alive.js b/test/parallel/test-http-keep-alive.js
similarity index 100%
rename from test/simple/test-http-keep-alive.js
rename to test/parallel/test-http-keep-alive.js

diff --git a/test/simple/test-http-keepalive-client.js b/test/parallel/test-http-keepalive-client.js
similarity index 100%
rename from test/simple/test-http-keepalive-client.js
rename to test/parallel/test-http-keepalive-client.js

diff --git a/test/simple/test-http-keepalive-maxsockets.js b/test/parallel/test-http-keepalive-maxsockets.js
similarity index 100%
rename from test/simple/test-http-keepalive-maxsockets.js
rename to test/parallel/test-http-keepalive-maxsockets.js

diff --git a/test/simple/test-http-keepalive-request.js b/test/parallel/test-http-keepalive-request.js
similarity index 100%
rename from test/simple/test-http-keepalive-request.js
rename to test/parallel/test-http-keepalive-request.js

diff --git a/test/simple/test-http-legacy.js b/test/parallel/test-http-legacy.js
similarity index 100%
rename from test/simple/test-http-legacy.js
rename to test/parallel/test-http-legacy.js

diff --git a/test/simple/test-http-localaddress-bind-error.js b/test/parallel/test-http-localaddress-bind-error.js
similarity index 100%
rename from test/simple/test-http-localaddress-bind-error.js
rename to test/parallel/test-http-localaddress-bind-error.js

diff --git a/test/simple/test-http-localaddress.js b/test/parallel/test-http-localaddress.js
similarity index 100%
rename from test/simple/test-http-localaddress.js
rename to test/parallel/test-http-localaddress.js

diff --git a/test/simple/test-http-malformed-request.js b/test/parallel/test-http-malformed-request.js
similarity index 100%
rename from test/simple/test-http-malformed-request.js
rename to test/parallel/test-http-malformed-request.js

diff --git a/test/simple/test-http-many-ended-pipelines.js b/test/parallel/test-http-many-ended-pipelines.js
similarity index 100%
rename from test/simple/test-http-many-ended-pipelines.js
rename to test/parallel/test-http-many-ended-pipelines.js

diff --git a/test/simple/test-http-max-headers-count.js b/test/parallel/test-http-max-headers-count.js
similarity index 100%
rename from test/simple/test-http-max-headers-count.js
rename to test/parallel/test-http-max-headers-count.js

diff --git a/test/simple/test-http-methods.js b/test/parallel/test-http-methods.js
similarity index 100%
rename from test/simple/test-http-methods.js
rename to test/parallel/test-http-methods.js

diff --git a/test/simple/test-http-multi-line-headers.js b/test/parallel/test-http-multi-line-headers.js
similarity index 100%
rename from test/simple/test-http-multi-line-headers.js
rename to test/parallel/test-http-multi-line-headers.js

diff --git a/test/simple/test-http-mutable-headers.js b/test/parallel/test-http-mutable-headers.js
similarity index 100%
rename from test/simple/test-http-mutable-headers.js
rename to test/parallel/test-http-mutable-headers.js

diff --git a/test/simple/test-http-no-content-length.js b/test/parallel/test-http-no-content-length.js
similarity index 100%
rename from test/simple/test-http-no-content-length.js
rename to test/parallel/test-http-no-content-length.js

diff --git a/test/simple/test-http-outgoing-finish.js b/test/parallel/test-http-outgoing-finish.js
similarity index 100%
rename from test/simple/test-http-outgoing-finish.js
rename to test/parallel/test-http-outgoing-finish.js

diff --git a/test/simple/test-http-parser-bad-ref.js b/test/parallel/test-http-parser-bad-ref.js
similarity index 100%
rename from test/simple/test-http-parser-bad-ref.js
rename to test/parallel/test-http-parser-bad-ref.js

diff --git a/test/simple/test-http-parser-free.js b/test/parallel/test-http-parser-free.js
similarity index 100%
rename from test/simple/test-http-parser-free.js
rename to test/parallel/test-http-parser-free.js

diff --git a/test/simple/test-http-parser.js b/test/parallel/test-http-parser.js
similarity index 100%
rename from test/simple/test-http-parser.js
rename to test/parallel/test-http-parser.js

diff --git a/test/simple/test-http-pause-resume-one-end.js b/test/parallel/test-http-pause-resume-one-end.js
similarity index 100%
rename from test/simple/test-http-pause-resume-one-end.js
rename to test/parallel/test-http-pause-resume-one-end.js

diff --git a/test/simple/test-http-pause.js b/test/parallel/test-http-pause.js
similarity index 100%
rename from test/simple/test-http-pause.js
rename to test/parallel/test-http-pause.js

diff --git a/test/simple/test-http-pipe-fs.js b/test/parallel/test-http-pipe-fs.js
similarity index 100%
rename from test/simple/test-http-pipe-fs.js
rename to test/parallel/test-http-pipe-fs.js

diff --git a/test/simple/test-http-proxy.js b/test/parallel/test-http-proxy.js
similarity index 100%
rename from test/simple/test-http-proxy.js
rename to test/parallel/test-http-proxy.js

diff --git a/test/simple/test-http-raw-headers.js b/test/parallel/test-http-raw-headers.js
similarity index 100%
rename from test/simple/test-http-raw-headers.js
rename to test/parallel/test-http-raw-headers.js

diff --git a/test/simple/test-http-remove-header-stays-removed.js b/test/parallel/test-http-remove-header-stays-removed.js
similarity index 100%
rename from test/simple/test-http-remove-header-stays-removed.js
rename to test/parallel/test-http-remove-header-stays-removed.js

diff --git a/test/simple/test-http-request-end-twice.js b/test/parallel/test-http-request-end-twice.js
similarity index 100%
rename from test/simple/test-http-request-end-twice.js
rename to test/parallel/test-http-request-end-twice.js

diff --git a/test/simple/test-http-request-end.js b/test/parallel/test-http-request-end.js
similarity index 100%
rename from test/simple/test-http-request-end.js
rename to test/parallel/test-http-request-end.js

diff --git a/test/simple/test-http-request-methods.js b/test/parallel/test-http-request-methods.js
similarity index 100%
rename from test/simple/test-http-request-methods.js
rename to test/parallel/test-http-request-methods.js

diff --git a/test/simple/test-http-res-write-after-end.js b/test/parallel/test-http-res-write-after-end.js
similarity index 100%
rename from test/simple/test-http-res-write-after-end.js
rename to test/parallel/test-http-res-write-after-end.js

diff --git a/test/simple/test-http-res-write-end-dont-take-array.js b/test/parallel/test-http-res-write-end-dont-take-array.js
similarity index 100%
rename from test/simple/test-http-res-write-end-dont-take-array.js
rename to test/parallel/test-http-res-write-end-dont-take-array.js

diff --git a/test/simple/test-http-response-close.js b/test/parallel/test-http-response-close.js
similarity index 100%
rename from test/simple/test-http-response-close.js
rename to test/parallel/test-http-response-close.js

diff --git a/test/simple/test-http-response-no-headers.js b/test/parallel/test-http-response-no-headers.js
similarity index 100%
rename from test/simple/test-http-response-no-headers.js
rename to test/parallel/test-http-response-no-headers.js

diff --git a/test/simple/test-http-response-readable.js b/test/parallel/test-http-response-readable.js
similarity index 100%
rename from test/simple/test-http-response-readable.js
rename to test/parallel/test-http-response-readable.js

diff --git a/test/simple/test-http-response-status-message.js b/test/parallel/test-http-response-status-message.js
similarity index 100%
rename from test/simple/test-http-response-status-message.js
rename to test/parallel/test-http-response-status-message.js

diff --git a/test/simple/test-http-server-multiheaders.js b/test/parallel/test-http-server-multiheaders.js
similarity index 100%
rename from test/simple/test-http-server-multiheaders.js
rename to test/parallel/test-http-server-multiheaders.js

diff --git a/test/simple/test-http-server-multiheaders2.js b/test/parallel/test-http-server-multiheaders2.js
similarity index 100%
rename from test/simple/test-http-server-multiheaders2.js
rename to test/parallel/test-http-server-multiheaders2.js

diff --git a/test/simple/test-http-server-stale-close.js b/test/parallel/test-http-server-stale-close.js
similarity index 100%
rename from test/simple/test-http-server-stale-close.js
rename to test/parallel/test-http-server-stale-close.js

diff --git a/test/simple/test-http-server.js b/test/parallel/test-http-server.js
similarity index 100%
rename from test/simple/test-http-server.js
rename to test/parallel/test-http-server.js

diff --git a/test/simple/test-http-set-cookies.js b/test/parallel/test-http-set-cookies.js
similarity index 100%
rename from test/simple/test-http-set-cookies.js
rename to test/parallel/test-http-set-cookies.js

diff --git a/test/simple/test-http-set-timeout-server.js b/test/parallel/test-http-set-timeout-server.js
similarity index 100%
rename from test/simple/test-http-set-timeout-server.js
rename to test/parallel/test-http-set-timeout-server.js

diff --git a/test/simple/test-http-set-timeout.js b/test/parallel/test-http-set-timeout.js
similarity index 100%
rename from test/simple/test-http-set-timeout.js
rename to test/parallel/test-http-set-timeout.js

diff --git a/test/simple/test-http-set-trailers.js b/test/parallel/test-http-set-trailers.js
similarity index 100%
rename from test/simple/test-http-set-trailers.js
rename to test/parallel/test-http-set-trailers.js

diff --git a/test/simple/test-http-should-keep-alive.js b/test/parallel/test-http-should-keep-alive.js
similarity index 100%
rename from test/simple/test-http-should-keep-alive.js
rename to test/parallel/test-http-should-keep-alive.js

diff --git a/test/simple/test-http-status-code.js b/test/parallel/test-http-status-code.js
similarity index 100%
rename from test/simple/test-http-status-code.js
rename to test/parallel/test-http-status-code.js

diff --git a/test/simple/test-http-status-message.js b/test/parallel/test-http-status-message.js
similarity index 100%
rename from test/simple/test-http-status-message.js
rename to test/parallel/test-http-status-message.js

diff --git a/test/simple/test-http-timeout-overflow.js b/test/parallel/test-http-timeout-overflow.js
similarity index 100%
rename from test/simple/test-http-timeout-overflow.js
rename to test/parallel/test-http-timeout-overflow.js

diff --git a/test/simple/test-http-timeout.js b/test/parallel/test-http-timeout.js
similarity index 100%
rename from test/simple/test-http-timeout.js
rename to test/parallel/test-http-timeout.js

diff --git a/test/simple/test-http-unix-socket.js b/test/parallel/test-http-unix-socket.js
similarity index 100%
rename from test/simple/test-http-unix-socket.js
rename to test/parallel/test-http-unix-socket.js

diff --git a/test/simple/test-http-upgrade-agent.js b/test/parallel/test-http-upgrade-agent.js
similarity index 100%
rename from test/simple/test-http-upgrade-agent.js
rename to test/parallel/test-http-upgrade-agent.js

diff --git a/test/simple/test-http-upgrade-client.js b/test/parallel/test-http-upgrade-client.js
similarity index 100%
rename from test/simple/test-http-upgrade-client.js
rename to test/parallel/test-http-upgrade-client.js

diff --git a/test/simple/test-http-upgrade-client2.js b/test/parallel/test-http-upgrade-client2.js
similarity index 100%
rename from test/simple/test-http-upgrade-client2.js
rename to test/parallel/test-http-upgrade-client2.js

diff --git a/test/simple/test-http-upgrade-server.js b/test/parallel/test-http-upgrade-server.js
similarity index 100%
rename from test/simple/test-http-upgrade-server.js
rename to test/parallel/test-http-upgrade-server.js

diff --git a/test/simple/test-http-upgrade-server2.js b/test/parallel/test-http-upgrade-server2.js
similarity index 100%
rename from test/simple/test-http-upgrade-server2.js
rename to test/parallel/test-http-upgrade-server2.js

diff --git a/test/simple/test-http-url.parse-auth-with-header-in-request.js b/test/parallel/test-http-url.parse-auth-with-header-in-request.js
similarity index 100%
rename from test/simple/test-http-url.parse-auth-with-header-in-request.js
rename to test/parallel/test-http-url.parse-auth-with-header-in-request.js

diff --git a/test/simple/test-http-url.parse-auth.js b/test/parallel/test-http-url.parse-auth.js
similarity index 100%
rename from test/simple/test-http-url.parse-auth.js
rename to test/parallel/test-http-url.parse-auth.js

diff --git a/test/simple/test-http-url.parse-basic.js b/test/parallel/test-http-url.parse-basic.js
similarity index 100%
rename from test/simple/test-http-url.parse-basic.js
rename to test/parallel/test-http-url.parse-basic.js

diff --git a/test/simple/test-http-url.parse-https.request.js b/test/parallel/test-http-url.parse-https.request.js
similarity index 100%
rename from test/simple/test-http-url.parse-https.request.js
rename to test/parallel/test-http-url.parse-https.request.js

diff --git a/test/simple/test-http-url.parse-only-support-http-https-protocol.js b/test/parallel/test-http-url.parse-only-support-http-https-protocol.js
similarity index 100%
rename from test/simple/test-http-url.parse-only-support-http-https-protocol.js
rename to test/parallel/test-http-url.parse-only-support-http-https-protocol.js

diff --git a/test/simple/test-http-url.parse-path.js b/test/parallel/test-http-url.parse-path.js
similarity index 100%
rename from test/simple/test-http-url.parse-path.js
rename to test/parallel/test-http-url.parse-path.js

diff --git a/test/simple/test-http-url.parse-post.js b/test/parallel/test-http-url.parse-post.js
similarity index 100%
rename from test/simple/test-http-url.parse-post.js
rename to test/parallel/test-http-url.parse-post.js

diff --git a/test/simple/test-http-url.parse-search.js b/test/parallel/test-http-url.parse-search.js
similarity index 100%
rename from test/simple/test-http-url.parse-search.js
rename to test/parallel/test-http-url.parse-search.js

diff --git a/test/simple/test-http-wget.js b/test/parallel/test-http-wget.js
similarity index 100%
rename from test/simple/test-http-wget.js
rename to test/parallel/test-http-wget.js

diff --git a/test/simple/test-http-write-callbacks.js b/test/parallel/test-http-write-callbacks.js
similarity index 100%
rename from test/simple/test-http-write-callbacks.js
rename to test/parallel/test-http-write-callbacks.js

diff --git a/test/simple/test-http-write-empty-string.js b/test/parallel/test-http-write-empty-string.js
similarity index 100%
rename from test/simple/test-http-write-empty-string.js
rename to test/parallel/test-http-write-empty-string.js

diff --git a/test/simple/test-http-write-head.js b/test/parallel/test-http-write-head.js
similarity index 100%
rename from test/simple/test-http-write-head.js
rename to test/parallel/test-http-write-head.js

diff --git a/test/simple/test-http-zero-length-write.js b/test/parallel/test-http-zero-length-write.js
similarity index 100%
rename from test/simple/test-http-zero-length-write.js
rename to test/parallel/test-http-zero-length-write.js

diff --git a/test/simple/test-http.js b/test/parallel/test-http.js
similarity index 100%
rename from test/simple/test-http.js
rename to test/parallel/test-http.js

diff --git a/test/simple/test-https-agent.js b/test/parallel/test-https-agent.js
similarity index 100%
rename from test/simple/test-https-agent.js
rename to test/parallel/test-https-agent.js

diff --git a/test/simple/test-https-byteswritten.js b/test/parallel/test-https-byteswritten.js
similarity index 100%
rename from test/simple/test-https-byteswritten.js
rename to test/parallel/test-https-byteswritten.js

diff --git a/test/simple/test-https-client-checkServerIdentity.js b/test/parallel/test-https-client-checkServerIdentity.js
similarity index 100%
rename from test/simple/test-https-client-checkServerIdentity.js
rename to test/parallel/test-https-client-checkServerIdentity.js

diff --git a/test/simple/test-https-client-get-url.js b/test/parallel/test-https-client-get-url.js
similarity index 100%
rename from test/simple/test-https-client-get-url.js
rename to test/parallel/test-https-client-get-url.js

diff --git a/test/simple/test-https-client-reject.js b/test/parallel/test-https-client-reject.js
similarity index 100%
rename from test/simple/test-https-client-reject.js
rename to test/parallel/test-https-client-reject.js

diff --git a/test/simple/test-https-client-resume.js b/test/parallel/test-https-client-resume.js
similarity index 100%
rename from test/simple/test-https-client-resume.js
rename to test/parallel/test-https-client-resume.js

diff --git a/test/simple/test-https-connecting-to-http.js b/test/parallel/test-https-connecting-to-http.js
similarity index 100%
rename from test/simple/test-https-connecting-to-http.js
rename to test/parallel/test-https-connecting-to-http.js

diff --git a/test/simple/test-https-drain.js b/test/parallel/test-https-drain.js
similarity index 100%
rename from test/simple/test-https-drain.js
rename to test/parallel/test-https-drain.js

diff --git a/test/simple/test-https-eof-for-eom.js b/test/parallel/test-https-eof-for-eom.js
similarity index 100%
rename from test/simple/test-https-eof-for-eom.js
rename to test/parallel/test-https-eof-for-eom.js

diff --git a/test/simple/test-https-foafssl.js b/test/parallel/test-https-foafssl.js
similarity index 100%
rename from test/simple/test-https-foafssl.js
rename to test/parallel/test-https-foafssl.js

diff --git a/test/simple/test-https-localaddress-bind-error.js b/test/parallel/test-https-localaddress-bind-error.js
similarity index 100%
rename from test/simple/test-https-localaddress-bind-error.js
rename to test/parallel/test-https-localaddress-bind-error.js

diff --git a/test/simple/test-https-localaddress.js b/test/parallel/test-https-localaddress.js
similarity index 100%
rename from test/simple/test-https-localaddress.js
rename to test/parallel/test-https-localaddress.js

diff --git a/test/simple/test-https-pfx.js b/test/parallel/test-https-pfx.js
similarity index 100%
rename from test/simple/test-https-pfx.js
rename to test/parallel/test-https-pfx.js

diff --git a/test/simple/test-https-req-split.js b/test/parallel/test-https-req-split.js
similarity index 100%
rename from test/simple/test-https-req-split.js
rename to test/parallel/test-https-req-split.js

diff --git a/test/simple/test-https-set-timeout-server.js b/test/parallel/test-https-set-timeout-server.js
similarity index 100%
rename from test/simple/test-https-set-timeout-server.js
rename to test/parallel/test-https-set-timeout-server.js

diff --git a/test/simple/test-https-simple.js b/test/parallel/test-https-simple.js
similarity index 100%
rename from test/simple/test-https-simple.js
rename to test/parallel/test-https-simple.js

diff --git a/test/simple/test-https-socket-options.js b/test/parallel/test-https-socket-options.js
similarity index 100%
rename from test/simple/test-https-socket-options.js
rename to test/parallel/test-https-socket-options.js

diff --git a/test/simple/test-https-strict.js b/test/parallel/test-https-strict.js
similarity index 100%
rename from test/simple/test-https-strict.js
rename to test/parallel/test-https-strict.js

diff --git a/test/simple/test-https-timeout-server-2.js b/test/parallel/test-https-timeout-server-2.js
similarity index 100%
rename from test/simple/test-https-timeout-server-2.js
rename to test/parallel/test-https-timeout-server-2.js

diff --git a/test/simple/test-https-timeout-server.js b/test/parallel/test-https-timeout-server.js
similarity index 100%
rename from test/simple/test-https-timeout-server.js
rename to test/parallel/test-https-timeout-server.js

diff --git a/test/simple/test-https-timeout.js b/test/parallel/test-https-timeout.js
similarity index 100%
rename from test/simple/test-https-timeout.js
rename to test/parallel/test-https-timeout.js

diff --git a/test/simple/test-https-truncate.js b/test/parallel/test-https-truncate.js
similarity index 100%
rename from test/simple/test-https-truncate.js
rename to test/parallel/test-https-truncate.js

diff --git a/test/simple/test-listen-fd-cluster.js b/test/parallel/test-listen-fd-cluster.js
similarity index 100%
rename from test/simple/test-listen-fd-cluster.js
rename to test/parallel/test-listen-fd-cluster.js

diff --git a/test/simple/test-listen-fd-detached-inherit.js b/test/parallel/test-listen-fd-detached-inherit.js
similarity index 100%
rename from test/simple/test-listen-fd-detached-inherit.js
rename to test/parallel/test-listen-fd-detached-inherit.js

diff --git a/test/simple/test-listen-fd-detached.js b/test/parallel/test-listen-fd-detached.js
similarity index 100%
rename from test/simple/test-listen-fd-detached.js
rename to test/parallel/test-listen-fd-detached.js

diff --git a/test/simple/test-listen-fd-ebadf.js b/test/parallel/test-listen-fd-ebadf.js
similarity index 100%
rename from test/simple/test-listen-fd-ebadf.js
rename to test/parallel/test-listen-fd-ebadf.js

diff --git a/test/simple/test-listen-fd-server.js b/test/parallel/test-listen-fd-server.js
similarity index 100%
rename from test/simple/test-listen-fd-server.js
rename to test/parallel/test-listen-fd-server.js

diff --git a/test/simple/test-memory-usage.js b/test/parallel/test-memory-usage.js
similarity index 100%
rename from test/simple/test-memory-usage.js
rename to test/parallel/test-memory-usage.js

diff --git a/test/simple/test-microtask-queue-integration-domain.js b/test/parallel/test-microtask-queue-integration-domain.js
similarity index 100%
rename from test/simple/test-microtask-queue-integration-domain.js
rename to test/parallel/test-microtask-queue-integration-domain.js

diff --git a/test/simple/test-microtask-queue-integration.js b/test/parallel/test-microtask-queue-integration.js
similarity index 100%
rename from test/simple/test-microtask-queue-integration.js
rename to test/parallel/test-microtask-queue-integration.js

diff --git a/test/simple/test-microtask-queue-run-domain.js b/test/parallel/test-microtask-queue-run-domain.js
similarity index 100%
rename from test/simple/test-microtask-queue-run-domain.js
rename to test/parallel/test-microtask-queue-run-domain.js

diff --git a/test/simple/test-microtask-queue-run-immediate-domain.js b/test/parallel/test-microtask-queue-run-immediate-domain.js
similarity index 100%
rename from test/simple/test-microtask-queue-run-immediate-domain.js
rename to test/parallel/test-microtask-queue-run-immediate-domain.js

diff --git a/test/simple/test-microtask-queue-run-immediate.js b/test/parallel/test-microtask-queue-run-immediate.js
similarity index 100%
rename from test/simple/test-microtask-queue-run-immediate.js
rename to test/parallel/test-microtask-queue-run-immediate.js

diff --git a/test/simple/test-microtask-queue-run.js b/test/parallel/test-microtask-queue-run.js
similarity index 100%
rename from test/simple/test-microtask-queue-run.js
rename to test/parallel/test-microtask-queue-run.js

diff --git a/test/simple/test-module-globalpaths-nodepath.js b/test/parallel/test-module-globalpaths-nodepath.js
similarity index 100%
rename from test/simple/test-module-globalpaths-nodepath.js
rename to test/parallel/test-module-globalpaths-nodepath.js

diff --git a/test/simple/test-module-loading-error.js b/test/parallel/test-module-loading-error.js
similarity index 100%
rename from test/simple/test-module-loading-error.js
rename to test/parallel/test-module-loading-error.js

diff --git a/test/simple/test-module-nodemodulepaths.js b/test/parallel/test-module-nodemodulepaths.js
similarity index 100%
rename from test/simple/test-module-nodemodulepaths.js
rename to test/parallel/test-module-nodemodulepaths.js

diff --git a/test/simple/test-net-after-close.js b/test/parallel/test-net-after-close.js
similarity index 100%
rename from test/simple/test-net-after-close.js
rename to test/parallel/test-net-after-close.js

diff --git a/test/simple/test-net-better-error-messages-listen-path.js b/test/parallel/test-net-better-error-messages-listen-path.js
similarity index 100%
rename from test/simple/test-net-better-error-messages-listen-path.js
rename to test/parallel/test-net-better-error-messages-listen-path.js

diff --git a/test/simple/test-net-better-error-messages-listen.js b/test/parallel/test-net-better-error-messages-listen.js
similarity index 100%
rename from test/simple/test-net-better-error-messages-listen.js
rename to test/parallel/test-net-better-error-messages-listen.js

diff --git a/test/simple/test-net-better-error-messages-path.js b/test/parallel/test-net-better-error-messages-path.js
similarity index 100%
rename from test/simple/test-net-better-error-messages-path.js
rename to test/parallel/test-net-better-error-messages-path.js

diff --git a/test/simple/test-net-better-error-messages-port-hostname.js b/test/parallel/test-net-better-error-messages-port-hostname.js
similarity index 100%
rename from test/simple/test-net-better-error-messages-port-hostname.js
rename to test/parallel/test-net-better-error-messages-port-hostname.js

diff --git a/test/simple/test-net-better-error-messages-port.js b/test/parallel/test-net-better-error-messages-port.js
similarity index 100%
rename from test/simple/test-net-better-error-messages-port.js
rename to test/parallel/test-net-better-error-messages-port.js

diff --git a/test/simple/test-net-binary.js b/test/parallel/test-net-binary.js
similarity index 100%
rename from test/simple/test-net-binary.js
rename to test/parallel/test-net-binary.js

diff --git a/test/simple/test-net-bind-twice.js b/test/parallel/test-net-bind-twice.js
similarity index 100%
rename from test/simple/test-net-bind-twice.js
rename to test/parallel/test-net-bind-twice.js

diff --git a/test/simple/test-net-buffersize.js b/test/parallel/test-net-buffersize.js
similarity index 100%
rename from test/simple/test-net-buffersize.js
rename to test/parallel/test-net-buffersize.js

diff --git a/test/simple/test-net-bytes-stats.js b/test/parallel/test-net-bytes-stats.js
similarity index 100%
rename from test/simple/test-net-bytes-stats.js
rename to test/parallel/test-net-bytes-stats.js

diff --git a/test/simple/test-net-can-reset-timeout.js b/test/parallel/test-net-can-reset-timeout.js
similarity index 100%
rename from test/simple/test-net-can-reset-timeout.js
rename to test/parallel/test-net-can-reset-timeout.js

diff --git a/test/simple/test-net-connect-buffer.js b/test/parallel/test-net-connect-buffer.js
similarity index 100%
rename from test/simple/test-net-connect-buffer.js
rename to test/parallel/test-net-connect-buffer.js

diff --git a/test/simple/test-net-connect-handle-econnrefused.js b/test/parallel/test-net-connect-handle-econnrefused.js
similarity index 100%
rename from test/simple/test-net-connect-handle-econnrefused.js
rename to test/parallel/test-net-connect-handle-econnrefused.js

diff --git a/test/simple/test-net-connect-immediate-finish.js b/test/parallel/test-net-connect-immediate-finish.js
similarity index 100%
rename from test/simple/test-net-connect-immediate-finish.js
rename to test/parallel/test-net-connect-immediate-finish.js

diff --git a/test/simple/test-net-connect-options-ipv6.js b/test/parallel/test-net-connect-options-ipv6.js
similarity index 100%
rename from test/simple/test-net-connect-options-ipv6.js
rename to test/parallel/test-net-connect-options-ipv6.js

diff --git a/test/simple/test-net-connect-options.js b/test/parallel/test-net-connect-options.js
similarity index 100%
rename from test/simple/test-net-connect-options.js
rename to test/parallel/test-net-connect-options.js

diff --git a/test/simple/test-net-connect-paused-connection.js b/test/parallel/test-net-connect-paused-connection.js
similarity index 94%
rename from test/simple/test-net-connect-paused-connection.js
rename to test/parallel/test-net-connect-paused-connection.js
index c38f51e..9d9db10 100644 (file)
--- a/test/simple/test-net-connect-paused-connection.js
+++ b/test/parallel/test-net-connect-paused-connection.js
@@ -26,9 +26,9 @@ var net = require('net');
 
 net.createServer(function(conn) {
   conn.unref();
-}).listen(8124).unref();
+}).listen(common.PORT).unref();
 
-net.connect(8124, 'localhost').pause();
+net.connect(common.PORT, 'localhost').pause();
 
 setTimeout(function() {
   assert.fail('expected to exit');

diff --git a/test/simple/test-net-create-connection.js b/test/parallel/test-net-create-connection.js
similarity index 100%
rename from test/simple/test-net-create-connection.js
rename to test/parallel/test-net-create-connection.js

diff --git a/test/simple/test-net-dns-error.js b/test/parallel/test-net-dns-error.js
similarity index 100%
rename from test/simple/test-net-dns-error.js
rename to test/parallel/test-net-dns-error.js

diff --git a/test/simple/test-net-dns-lookup.js b/test/parallel/test-net-dns-lookup.js
similarity index 100%
rename from test/simple/test-net-dns-lookup.js
rename to test/parallel/test-net-dns-lookup.js

diff --git a/test/simple/test-net-during-close.js b/test/parallel/test-net-during-close.js
similarity index 100%
rename from test/simple/test-net-during-close.js
rename to test/parallel/test-net-during-close.js

diff --git a/test/simple/test-net-eaddrinuse.js b/test/parallel/test-net-eaddrinuse.js
similarity index 100%
rename from test/simple/test-net-eaddrinuse.js
rename to test/parallel/test-net-eaddrinuse.js

diff --git a/test/simple/test-net-end-without-connect.js b/test/parallel/test-net-end-without-connect.js
similarity index 100%
rename from test/simple/test-net-end-without-connect.js
rename to test/parallel/test-net-end-without-connect.js

diff --git a/test/simple/test-net-error-twice.js b/test/parallel/test-net-error-twice.js
similarity index 100%
rename from test/simple/test-net-error-twice.js
rename to test/parallel/test-net-error-twice.js

diff --git a/test/simple/test-net-isip.js b/test/parallel/test-net-isip.js
similarity index 100%
rename from test/simple/test-net-isip.js
rename to test/parallel/test-net-isip.js

diff --git a/test/simple/test-net-keepalive.js b/test/parallel/test-net-keepalive.js
similarity index 100%
rename from test/simple/test-net-keepalive.js
rename to test/parallel/test-net-keepalive.js

diff --git a/test/simple/test-net-large-string.js b/test/parallel/test-net-large-string.js
similarity index 100%
rename from test/simple/test-net-large-string.js
rename to test/parallel/test-net-large-string.js

diff --git a/test/simple/test-net-listen-close-server.js b/test/parallel/test-net-listen-close-server.js
similarity index 100%
rename from test/simple/test-net-listen-close-server.js
rename to test/parallel/test-net-listen-close-server.js

diff --git a/test/simple/test-net-listen-error.js b/test/parallel/test-net-listen-error.js
similarity index 100%
rename from test/simple/test-net-listen-error.js
rename to test/parallel/test-net-listen-error.js

diff --git a/test/simple/test-net-listen-fd0.js b/test/parallel/test-net-listen-fd0.js
similarity index 100%
rename from test/simple/test-net-listen-fd0.js
rename to test/parallel/test-net-listen-fd0.js

diff --git a/test/simple/test-net-listen-shared-ports.js b/test/parallel/test-net-listen-shared-ports.js
similarity index 100%
rename from test/simple/test-net-listen-shared-ports.js
rename to test/parallel/test-net-listen-shared-ports.js

diff --git a/test/simple/test-net-local-address-port.js b/test/parallel/test-net-local-address-port.js
similarity index 100%
rename from test/simple/test-net-local-address-port.js
rename to test/parallel/test-net-local-address-port.js

diff --git a/test/simple/test-net-localerror.js b/test/parallel/test-net-localerror.js
similarity index 100%
rename from test/simple/test-net-localerror.js
rename to test/parallel/test-net-localerror.js

diff --git a/test/simple/test-net-pause-resume-connecting.js b/test/parallel/test-net-pause-resume-connecting.js
similarity index 100%
rename from test/simple/test-net-pause-resume-connecting.js
rename to test/parallel/test-net-pause-resume-connecting.js

diff --git a/test/simple/test-net-pingpong.js b/test/parallel/test-net-pingpong.js
similarity index 100%
rename from test/simple/test-net-pingpong.js
rename to test/parallel/test-net-pingpong.js

diff --git a/test/simple/test-net-pipe-connect-errors.js b/test/parallel/test-net-pipe-connect-errors.js
similarity index 100%
rename from test/simple/test-net-pipe-connect-errors.js
rename to test/parallel/test-net-pipe-connect-errors.js

diff --git a/test/simple/test-net-reconnect-error.js b/test/parallel/test-net-reconnect-error.js
similarity index 100%
rename from test/simple/test-net-reconnect-error.js
rename to test/parallel/test-net-reconnect-error.js

diff --git a/test/simple/test-net-reconnect.js b/test/parallel/test-net-reconnect.js
similarity index 100%
rename from test/simple/test-net-reconnect.js
rename to test/parallel/test-net-reconnect.js

diff --git a/test/simple/test-net-remote-address-port.js b/test/parallel/test-net-remote-address-port.js
similarity index 100%
rename from test/simple/test-net-remote-address-port.js
rename to test/parallel/test-net-remote-address-port.js

diff --git a/test/simple/test-net-server-close.js b/test/parallel/test-net-server-close.js
similarity index 100%
rename from test/simple/test-net-server-close.js
rename to test/parallel/test-net-server-close.js

diff --git a/test/simple/test-net-server-connections.js b/test/parallel/test-net-server-connections.js
similarity index 100%
rename from test/simple/test-net-server-connections.js
rename to test/parallel/test-net-server-connections.js

diff --git a/test/simple/test-net-server-listen-remove-callback.js b/test/parallel/test-net-server-listen-remove-callback.js
similarity index 100%
rename from test/simple/test-net-server-listen-remove-callback.js
rename to test/parallel/test-net-server-listen-remove-callback.js

diff --git a/test/simple/test-net-server-max-connections.js b/test/parallel/test-net-server-max-connections.js
similarity index 100%
rename from test/simple/test-net-server-max-connections.js
rename to test/parallel/test-net-server-max-connections.js

diff --git a/test/simple/test-net-server-pause-on-connect.js b/test/parallel/test-net-server-pause-on-connect.js
similarity index 100%
rename from test/simple/test-net-server-pause-on-connect.js
rename to test/parallel/test-net-server-pause-on-connect.js

diff --git a/test/simple/test-net-server-try-ports.js b/test/parallel/test-net-server-try-ports.js
similarity index 100%
rename from test/simple/test-net-server-try-ports.js
rename to test/parallel/test-net-server-try-ports.js

diff --git a/test/simple/test-net-server-unref.js b/test/parallel/test-net-server-unref.js
similarity index 98%
rename from test/simple/test-net-server-unref.js
rename to test/parallel/test-net-server-unref.js
index d20cbe5..f7f994b 100644 (file)
--- a/test/simple/test-net-server-unref.js
+++ b/test/parallel/test-net-server-unref.js
@@ -26,7 +26,7 @@ var net = require('net');
 var closed = false;
 
 var s = net.createServer();
-s.listen();
+s.listen(common.PORT);
 s.unref();
 
 setTimeout(function() {

diff --git a/test/simple/test-net-settimeout.js b/test/parallel/test-net-settimeout.js
similarity index 100%
rename from test/simple/test-net-settimeout.js
rename to test/parallel/test-net-settimeout.js

diff --git a/test/simple/test-net-socket-destroy-twice.js b/test/parallel/test-net-socket-destroy-twice.js
similarity index 100%
rename from test/simple/test-net-socket-destroy-twice.js
rename to test/parallel/test-net-socket-destroy-twice.js

diff --git a/test/simple/test-net-socket-timeout-unref.js b/test/parallel/test-net-socket-timeout-unref.js
similarity index 100%
rename from test/simple/test-net-socket-timeout-unref.js
rename to test/parallel/test-net-socket-timeout-unref.js

diff --git a/test/simple/test-net-socket-timeout.js b/test/parallel/test-net-socket-timeout.js
similarity index 100%
rename from test/simple/test-net-socket-timeout.js
rename to test/parallel/test-net-socket-timeout.js

diff --git a/test/simple/test-net-stream.js b/test/parallel/test-net-stream.js
similarity index 100%
rename from test/simple/test-net-stream.js
rename to test/parallel/test-net-stream.js

diff --git a/test/simple/test-net-write-after-close.js b/test/parallel/test-net-write-after-close.js
similarity index 100%
rename from test/simple/test-net-write-after-close.js
rename to test/parallel/test-net-write-after-close.js

diff --git a/test/simple/test-net-write-connect-write.js b/test/parallel/test-net-write-connect-write.js
similarity index 100%
rename from test/simple/test-net-write-connect-write.js
rename to test/parallel/test-net-write-connect-write.js

diff --git a/test/simple/test-net-write-slow.js b/test/parallel/test-net-write-slow.js
similarity index 100%
rename from test/simple/test-net-write-slow.js
rename to test/parallel/test-net-write-slow.js

diff --git a/test/simple/test-next-tick-doesnt-hang.js b/test/parallel/test-next-tick-doesnt-hang.js
similarity index 100%
rename from test/simple/test-next-tick-doesnt-hang.js
rename to test/parallel/test-next-tick-doesnt-hang.js

diff --git a/test/simple/test-next-tick-domain.js b/test/parallel/test-next-tick-domain.js
similarity index 100%
rename from test/simple/test-next-tick-domain.js
rename to test/parallel/test-next-tick-domain.js

diff --git a/test/simple/test-next-tick-errors.js b/test/parallel/test-next-tick-errors.js
similarity index 100%
rename from test/simple/test-next-tick-errors.js
rename to test/parallel/test-next-tick-errors.js

diff --git a/test/simple/test-next-tick-intentional-starvation.js b/test/parallel/test-next-tick-intentional-starvation.js
similarity index 100%
rename from test/simple/test-next-tick-intentional-starvation.js
rename to test/parallel/test-next-tick-intentional-starvation.js

diff --git a/test/simple/test-next-tick-ordering.js b/test/parallel/test-next-tick-ordering.js
similarity index 100%
rename from test/simple/test-next-tick-ordering.js
rename to test/parallel/test-next-tick-ordering.js

diff --git a/test/simple/test-next-tick-ordering2.js b/test/parallel/test-next-tick-ordering2.js
similarity index 100%
rename from test/simple/test-next-tick-ordering2.js
rename to test/parallel/test-next-tick-ordering2.js

diff --git a/test/simple/test-next-tick.js b/test/parallel/test-next-tick.js
similarity index 100%
rename from test/simple/test-next-tick.js
rename to test/parallel/test-next-tick.js

diff --git a/test/simple/test-os.js b/test/parallel/test-os.js
similarity index 100%
rename from test/simple/test-os.js
rename to test/parallel/test-os.js

diff --git a/test/simple/test-path-makelong.js b/test/parallel/test-path-makelong.js
similarity index 100%
rename from test/simple/test-path-makelong.js
rename to test/parallel/test-path-makelong.js

diff --git a/test/simple/test-path-parse-format.js b/test/parallel/test-path-parse-format.js
similarity index 100%
rename from test/simple/test-path-parse-format.js
rename to test/parallel/test-path-parse-format.js

diff --git a/test/simple/test-path.js b/test/parallel/test-path.js
similarity index 99%
rename from test/simple/test-path.js
rename to test/parallel/test-path.js
index 7a8a1b1..45fd282 100644 (file)
--- a/test/simple/test-path.js
+++ b/test/parallel/test-path.js
@@ -61,8 +61,8 @@ if (!isWindows) {
 
 assert.equal(path.extname(f), '.js');
 
-assert.equal(path.dirname(f).substr(-11),
-             isWindows ? 'test\\simple' : 'test/simple');
+assert.equal(path.dirname(f).substr(-13),
+             isWindows ? 'test\\parallel' : 'test/parallel');
 assert.equal(path.dirname('/a/b/'), '/a');
 assert.equal(path.dirname('/a/b'), '/a');
 assert.equal(path.dirname('/a'), '/');

diff --git a/test/simple/test-pipe-file-to-http.js b/test/parallel/test-pipe-file-to-http.js
similarity index 100%
rename from test/simple/test-pipe-file-to-http.js
rename to test/parallel/test-pipe-file-to-http.js

diff --git a/test/simple/test-pipe-return-val.js b/test/parallel/test-pipe-return-val.js
similarity index 100%
rename from test/simple/test-pipe-return-val.js
rename to test/parallel/test-pipe-return-val.js

diff --git a/test/simple/test-process-active-wraps.js b/test/parallel/test-process-active-wraps.js
similarity index 100%
rename from test/simple/test-process-active-wraps.js
rename to test/parallel/test-process-active-wraps.js

diff --git a/test/simple/test-process-argv-0.js b/test/parallel/test-process-argv-0.js
similarity index 100%
rename from test/simple/test-process-argv-0.js
rename to test/parallel/test-process-argv-0.js

diff --git a/test/simple/test-process-before-exit.js b/test/parallel/test-process-before-exit.js
similarity index 100%
rename from test/simple/test-process-before-exit.js
rename to test/parallel/test-process-before-exit.js

diff --git a/test/simple/test-process-binding.js b/test/parallel/test-process-binding.js
similarity index 100%
rename from test/simple/test-process-binding.js
rename to test/parallel/test-process-binding.js

diff --git a/test/simple/test-process-config.js b/test/parallel/test-process-config.js
similarity index 100%
rename from test/simple/test-process-config.js
rename to test/parallel/test-process-config.js

diff --git a/test/simple/test-process-env.js b/test/parallel/test-process-env.js
similarity index 100%
rename from test/simple/test-process-env.js
rename to test/parallel/test-process-env.js

diff --git a/test/simple/test-process-exec-argv.js b/test/parallel/test-process-exec-argv.js
similarity index 100%
rename from test/simple/test-process-exec-argv.js
rename to test/parallel/test-process-exec-argv.js

diff --git a/test/simple/test-process-exit-code.js b/test/parallel/test-process-exit-code.js
similarity index 100%
rename from test/simple/test-process-exit-code.js
rename to test/parallel/test-process-exit-code.js

diff --git a/test/simple/test-process-exit-from-before-exit.js b/test/parallel/test-process-exit-from-before-exit.js
similarity index 100%
rename from test/simple/test-process-exit-from-before-exit.js
rename to test/parallel/test-process-exit-from-before-exit.js

diff --git a/test/simple/test-process-exit-recursive.js b/test/parallel/test-process-exit-recursive.js
similarity index 100%
rename from test/simple/test-process-exit-recursive.js
rename to test/parallel/test-process-exit-recursive.js

diff --git a/test/simple/test-process-exit.js b/test/parallel/test-process-exit.js
similarity index 100%
rename from test/simple/test-process-exit.js
rename to test/parallel/test-process-exit.js

diff --git a/test/simple/test-process-getgroups.js b/test/parallel/test-process-getgroups.js
similarity index 100%
rename from test/simple/test-process-getgroups.js
rename to test/parallel/test-process-getgroups.js

diff --git a/test/simple/test-process-hrtime.js b/test/parallel/test-process-hrtime.js
similarity index 100%
rename from test/simple/test-process-hrtime.js
rename to test/parallel/test-process-hrtime.js

diff --git a/test/simple/test-process-kill-null.js b/test/parallel/test-process-kill-null.js
similarity index 100%
rename from test/simple/test-process-kill-null.js
rename to test/parallel/test-process-kill-null.js

diff --git a/test/simple/test-process-kill-pid.js b/test/parallel/test-process-kill-pid.js
similarity index 100%
rename from test/simple/test-process-kill-pid.js
rename to test/parallel/test-process-kill-pid.js

diff --git a/test/simple/test-process-next-tick.js b/test/parallel/test-process-next-tick.js
similarity index 100%
rename from test/simple/test-process-next-tick.js
rename to test/parallel/test-process-next-tick.js

diff --git a/test/simple/test-process-raw-debug.js b/test/parallel/test-process-raw-debug.js
similarity index 100%
rename from test/simple/test-process-raw-debug.js
rename to test/parallel/test-process-raw-debug.js

diff --git a/test/simple/test-process-wrap.js b/test/parallel/test-process-wrap.js
similarity index 100%
rename from test/simple/test-process-wrap.js
rename to test/parallel/test-process-wrap.js

diff --git a/test/simple/test-punycode.js b/test/parallel/test-punycode.js
similarity index 100%
rename from test/simple/test-punycode.js
rename to test/parallel/test-punycode.js

diff --git a/test/simple/test-querystring.js b/test/parallel/test-querystring.js
similarity index 100%
rename from test/simple/test-querystring.js
rename to test/parallel/test-querystring.js

diff --git a/test/simple/test-readdouble.js b/test/parallel/test-readdouble.js
similarity index 100%
rename from test/simple/test-readdouble.js
rename to test/parallel/test-readdouble.js

diff --git a/test/simple/test-readfloat.js b/test/parallel/test-readfloat.js
similarity index 100%
rename from test/simple/test-readfloat.js
rename to test/parallel/test-readfloat.js

diff --git a/test/simple/test-readint.js b/test/parallel/test-readint.js
similarity index 100%
rename from test/simple/test-readint.js
rename to test/parallel/test-readint.js

diff --git a/test/simple/test-readline-interface.js b/test/parallel/test-readline-interface.js
similarity index 100%
rename from test/simple/test-readline-interface.js
rename to test/parallel/test-readline-interface.js

diff --git a/test/simple/test-readline-set-raw-mode.js b/test/parallel/test-readline-set-raw-mode.js
similarity index 100%
rename from test/simple/test-readline-set-raw-mode.js
rename to test/parallel/test-readline-set-raw-mode.js

diff --git a/test/simple/test-readuint.js b/test/parallel/test-readuint.js
similarity index 100%
rename from test/simple/test-readuint.js
rename to test/parallel/test-readuint.js

diff --git a/test/simple/test-regress-GH-4256.js b/test/parallel/test-regress-GH-4256.js
similarity index 100%
rename from test/simple/test-regress-GH-4256.js
rename to test/parallel/test-regress-GH-4256.js

diff --git a/test/simple/test-regress-GH-5927.js b/test/parallel/test-regress-GH-5927.js
similarity index 100%
rename from test/simple/test-regress-GH-5927.js
rename to test/parallel/test-regress-GH-5927.js

diff --git a/test/simple/test-regress-GH-6235.js b/test/parallel/test-regress-GH-6235.js
similarity index 100%
rename from test/simple/test-regress-GH-6235.js
rename to test/parallel/test-regress-GH-6235.js

diff --git a/test/simple/test-regress-GH-7511.js b/test/parallel/test-regress-GH-7511.js
similarity index 100%
rename from test/simple/test-regress-GH-7511.js
rename to test/parallel/test-regress-GH-7511.js

diff --git a/test/simple/test-regress-GH-897.js b/test/parallel/test-regress-GH-897.js
similarity index 100%
rename from test/simple/test-regress-GH-897.js
rename to test/parallel/test-regress-GH-897.js

diff --git a/test/simple/test-regression-object-prototype.js b/test/parallel/test-regression-object-prototype.js
similarity index 100%
rename from test/simple/test-regression-object-prototype.js
rename to test/parallel/test-regression-object-prototype.js

diff --git a/test/simple/test-repl-.save.load.js b/test/parallel/test-repl-.save.load.js
similarity index 100%
rename from test/simple/test-repl-.save.load.js
rename to test/parallel/test-repl-.save.load.js

diff --git a/test/simple/test-repl-autolibs.js b/test/parallel/test-repl-autolibs.js
similarity index 100%
rename from test/simple/test-repl-autolibs.js
rename to test/parallel/test-repl-autolibs.js

diff --git a/test/simple/test-repl-console.js b/test/parallel/test-repl-console.js
similarity index 100%
rename from test/simple/test-repl-console.js
rename to test/parallel/test-repl-console.js

diff --git a/test/simple/test-repl-domain.js b/test/parallel/test-repl-domain.js
similarity index 100%
rename from test/simple/test-repl-domain.js
rename to test/parallel/test-repl-domain.js

diff --git a/test/simple/test-repl-end-emits-exit.js b/test/parallel/test-repl-end-emits-exit.js
similarity index 100%
rename from test/simple/test-repl-end-emits-exit.js
rename to test/parallel/test-repl-end-emits-exit.js

diff --git a/test/simple/test-repl-harmony.js b/test/parallel/test-repl-harmony.js
similarity index 100%
rename from test/simple/test-repl-harmony.js
rename to test/parallel/test-repl-harmony.js

diff --git a/test/simple/test-repl-options.js b/test/parallel/test-repl-options.js
similarity index 100%
rename from test/simple/test-repl-options.js
rename to test/parallel/test-repl-options.js

diff --git a/test/simple/test-repl-require-cache.js b/test/parallel/test-repl-require-cache.js
similarity index 100%
rename from test/simple/test-repl-require-cache.js
rename to test/parallel/test-repl-require-cache.js

diff --git a/test/simple/test-repl-reset-event.js b/test/parallel/test-repl-reset-event.js
similarity index 100%
rename from test/simple/test-repl-reset-event.js
rename to test/parallel/test-repl-reset-event.js

diff --git a/test/simple/test-repl-setprompt.js b/test/parallel/test-repl-setprompt.js
similarity index 100%
rename from test/simple/test-repl-setprompt.js
rename to test/parallel/test-repl-setprompt.js

diff --git a/test/simple/test-repl-syntax-error-handling.js b/test/parallel/test-repl-syntax-error-handling.js
similarity index 100%
rename from test/simple/test-repl-syntax-error-handling.js
rename to test/parallel/test-repl-syntax-error-handling.js

diff --git a/test/simple/test-repl-tab-complete.js b/test/parallel/test-repl-tab-complete.js
similarity index 100%
rename from test/simple/test-repl-tab-complete.js
rename to test/parallel/test-repl-tab-complete.js

diff --git a/test/simple/test-repl-timeout-throw.js b/test/parallel/test-repl-timeout-throw.js
similarity index 100%
rename from test/simple/test-repl-timeout-throw.js
rename to test/parallel/test-repl-timeout-throw.js

diff --git a/test/simple/test-repl.js b/test/parallel/test-repl.js
similarity index 100%
rename from test/simple/test-repl.js
rename to test/parallel/test-repl.js

diff --git a/test/simple/test-require-cache.js b/test/parallel/test-require-cache.js
similarity index 100%
rename from test/simple/test-require-cache.js
rename to test/parallel/test-require-cache.js

diff --git a/test/simple/test-require-exceptions.js b/test/parallel/test-require-exceptions.js
similarity index 100%
rename from test/simple/test-require-exceptions.js
rename to test/parallel/test-require-exceptions.js

diff --git a/test/simple/test-require-extensions-main.js b/test/parallel/test-require-extensions-main.js
similarity index 100%
rename from test/simple/test-require-extensions-main.js
rename to test/parallel/test-require-extensions-main.js

diff --git a/test/simple/test-require-extensions-same-filename-as-dir-trailing-slash.js b/test/parallel/test-require-extensions-same-filename-as-dir-trailing-slash.js
similarity index 100%
rename from test/simple/test-require-extensions-same-filename-as-dir-trailing-slash.js
rename to test/parallel/test-require-extensions-same-filename-as-dir-trailing-slash.js

diff --git a/test/simple/test-require-extensions-same-filename-as-dir.js b/test/parallel/test-require-extensions-same-filename-as-dir.js
similarity index 100%
rename from test/simple/test-require-extensions-same-filename-as-dir.js
rename to test/parallel/test-require-extensions-same-filename-as-dir.js

diff --git a/test/simple/test-require-json.js b/test/parallel/test-require-json.js
similarity index 100%
rename from test/simple/test-require-json.js
rename to test/parallel/test-require-json.js

diff --git a/test/simple/test-require-resolve.js b/test/parallel/test-require-resolve.js
similarity index 100%
rename from test/simple/test-require-resolve.js
rename to test/parallel/test-require-resolve.js

diff --git a/test/simple/test-signal-handler.js b/test/parallel/test-signal-handler.js
similarity index 100%
rename from test/simple/test-signal-handler.js
rename to test/parallel/test-signal-handler.js

diff --git a/test/simple/test-signal-safety.js b/test/parallel/test-signal-safety.js
similarity index 100%
rename from test/simple/test-signal-safety.js
rename to test/parallel/test-signal-safety.js

diff --git a/test/simple/test-smalloc.js b/test/parallel/test-smalloc.js
similarity index 100%
rename from test/simple/test-smalloc.js
rename to test/parallel/test-smalloc.js

diff --git a/test/simple/test-stdin-hang.js b/test/parallel/test-stdin-hang.js
similarity index 100%
rename from test/simple/test-stdin-hang.js
rename to test/parallel/test-stdin-hang.js

diff --git a/test/simple/test-stdin-pause-resume-sync.js b/test/parallel/test-stdin-pause-resume-sync.js
similarity index 100%
rename from test/simple/test-stdin-pause-resume-sync.js
rename to test/parallel/test-stdin-pause-resume-sync.js

diff --git a/test/simple/test-stdin-pause-resume.js b/test/parallel/test-stdin-pause-resume.js
similarity index 100%
rename from test/simple/test-stdin-pause-resume.js
rename to test/parallel/test-stdin-pause-resume.js

diff --git a/test/simple/test-stdin-resume-pause.js b/test/parallel/test-stdin-resume-pause.js
similarity index 100%
rename from test/simple/test-stdin-resume-pause.js
rename to test/parallel/test-stdin-resume-pause.js

diff --git a/test/simple/test-stdio-readable-writable.js b/test/parallel/test-stdio-readable-writable.js
similarity index 100%
rename from test/simple/test-stdio-readable-writable.js
rename to test/parallel/test-stdio-readable-writable.js

diff --git a/test/simple/test-stdout-close-unref.js b/test/parallel/test-stdout-close-unref.js
similarity index 100%
rename from test/simple/test-stdout-close-unref.js
rename to test/parallel/test-stdout-close-unref.js

diff --git a/test/simple/test-stream-big-packet.js b/test/parallel/test-stream-big-packet.js
similarity index 100%
rename from test/simple/test-stream-big-packet.js
rename to test/parallel/test-stream-big-packet.js

diff --git a/test/simple/test-stream-big-push.js b/test/parallel/test-stream-big-push.js
similarity index 100%
rename from test/simple/test-stream-big-push.js
rename to test/parallel/test-stream-big-push.js

diff --git a/test/simple/test-stream-duplex.js b/test/parallel/test-stream-duplex.js
similarity index 100%
rename from test/simple/test-stream-duplex.js
rename to test/parallel/test-stream-duplex.js

diff --git a/test/simple/test-stream-end-paused.js b/test/parallel/test-stream-end-paused.js
similarity index 100%
rename from test/simple/test-stream-end-paused.js
rename to test/parallel/test-stream-end-paused.js

diff --git a/test/simple/test-stream-ispaused.js b/test/parallel/test-stream-ispaused.js
similarity index 100%
rename from test/simple/test-stream-ispaused.js
rename to test/parallel/test-stream-ispaused.js

diff --git a/test/simple/test-stream-pipe-after-end.js b/test/parallel/test-stream-pipe-after-end.js
similarity index 100%
rename from test/simple/test-stream-pipe-after-end.js
rename to test/parallel/test-stream-pipe-after-end.js

diff --git a/test/simple/test-stream-pipe-cleanup.js b/test/parallel/test-stream-pipe-cleanup.js
similarity index 100%
rename from test/simple/test-stream-pipe-cleanup.js
rename to test/parallel/test-stream-pipe-cleanup.js

diff --git a/test/simple/test-stream-pipe-error-handling.js b/test/parallel/test-stream-pipe-error-handling.js
similarity index 100%
rename from test/simple/test-stream-pipe-error-handling.js
rename to test/parallel/test-stream-pipe-error-handling.js

diff --git a/test/simple/test-stream-pipe-event.js b/test/parallel/test-stream-pipe-event.js
similarity index 100%
rename from test/simple/test-stream-pipe-event.js
rename to test/parallel/test-stream-pipe-event.js

diff --git a/test/simple/test-stream-push-order.js b/test/parallel/test-stream-push-order.js
similarity index 100%
rename from test/simple/test-stream-push-order.js
rename to test/parallel/test-stream-push-order.js

diff --git a/test/simple/test-stream-push-strings.js b/test/parallel/test-stream-push-strings.js
similarity index 100%
rename from test/simple/test-stream-push-strings.js
rename to test/parallel/test-stream-push-strings.js

diff --git a/test/simple/test-stream-readable-event.js b/test/parallel/test-stream-readable-event.js
similarity index 100%
rename from test/simple/test-stream-readable-event.js
rename to test/parallel/test-stream-readable-event.js

diff --git a/test/simple/test-stream-readable-flow-recursion.js b/test/parallel/test-stream-readable-flow-recursion.js
similarity index 100%
rename from test/simple/test-stream-readable-flow-recursion.js
rename to test/parallel/test-stream-readable-flow-recursion.js

diff --git a/test/simple/test-stream-transform-objectmode-falsey-value.js b/test/parallel/test-stream-transform-objectmode-falsey-value.js
similarity index 100%
rename from test/simple/test-stream-transform-objectmode-falsey-value.js
rename to test/parallel/test-stream-transform-objectmode-falsey-value.js

diff --git a/test/simple/test-stream-transform-split-objectmode.js b/test/parallel/test-stream-transform-split-objectmode.js
similarity index 100%
rename from test/simple/test-stream-transform-split-objectmode.js
rename to test/parallel/test-stream-transform-split-objectmode.js

diff --git a/test/simple/test-stream-unshift-empty-chunk.js b/test/parallel/test-stream-unshift-empty-chunk.js
similarity index 100%
rename from test/simple/test-stream-unshift-empty-chunk.js
rename to test/parallel/test-stream-unshift-empty-chunk.js

diff --git a/test/simple/test-stream-unshift-read-race.js b/test/parallel/test-stream-unshift-read-race.js
similarity index 100%
rename from test/simple/test-stream-unshift-read-race.js
rename to test/parallel/test-stream-unshift-read-race.js

diff --git a/test/simple/test-stream-writable-change-default-encoding.js b/test/parallel/test-stream-writable-change-default-encoding.js
similarity index 100%
rename from test/simple/test-stream-writable-change-default-encoding.js
rename to test/parallel/test-stream-writable-change-default-encoding.js

diff --git a/test/simple/test-stream-writable-decoded-encoding.js b/test/parallel/test-stream-writable-decoded-encoding.js
similarity index 100%
rename from test/simple/test-stream-writable-decoded-encoding.js
rename to test/parallel/test-stream-writable-decoded-encoding.js

diff --git a/test/simple/test-stream-writev.js b/test/parallel/test-stream-writev.js
similarity index 100%
rename from test/simple/test-stream-writev.js
rename to test/parallel/test-stream-writev.js

diff --git a/test/simple/test-stream2-base64-single-char-read-end.js b/test/parallel/test-stream2-base64-single-char-read-end.js
similarity index 100%
rename from test/simple/test-stream2-base64-single-char-read-end.js
rename to test/parallel/test-stream2-base64-single-char-read-end.js

diff --git a/test/simple/test-stream2-compatibility.js b/test/parallel/test-stream2-compatibility.js
similarity index 100%
rename from test/simple/test-stream2-compatibility.js
rename to test/parallel/test-stream2-compatibility.js

diff --git a/test/simple/test-stream2-finish-pipe.js b/test/parallel/test-stream2-finish-pipe.js
similarity index 100%
rename from test/simple/test-stream2-finish-pipe.js
rename to test/parallel/test-stream2-finish-pipe.js

diff --git a/test/simple/test-stream2-large-read-stall.js b/test/parallel/test-stream2-large-read-stall.js
similarity index 100%
rename from test/simple/test-stream2-large-read-stall.js
rename to test/parallel/test-stream2-large-read-stall.js

diff --git a/test/simple/test-stream2-objects.js b/test/parallel/test-stream2-objects.js
similarity index 100%
rename from test/simple/test-stream2-objects.js
rename to test/parallel/test-stream2-objects.js

diff --git a/test/simple/test-stream2-pipe-error-handling.js b/test/parallel/test-stream2-pipe-error-handling.js
similarity index 100%
rename from test/simple/test-stream2-pipe-error-handling.js
rename to test/parallel/test-stream2-pipe-error-handling.js

diff --git a/test/simple/test-stream2-pipe-error-once-listener.js b/test/parallel/test-stream2-pipe-error-once-listener.js
similarity index 100%
rename from test/simple/test-stream2-pipe-error-once-listener.js
rename to test/parallel/test-stream2-pipe-error-once-listener.js

diff --git a/test/simple/test-stream2-push.js b/test/parallel/test-stream2-push.js
similarity index 100%
rename from test/simple/test-stream2-push.js
rename to test/parallel/test-stream2-push.js

diff --git a/test/simple/test-stream2-read-sync-stack.js b/test/parallel/test-stream2-read-sync-stack.js
similarity index 100%
rename from test/simple/test-stream2-read-sync-stack.js
rename to test/parallel/test-stream2-read-sync-stack.js

diff --git a/test/simple/test-stream2-readable-empty-buffer-no-eof.js b/test/parallel/test-stream2-readable-empty-buffer-no-eof.js
similarity index 100%
rename from test/simple/test-stream2-readable-empty-buffer-no-eof.js
rename to test/parallel/test-stream2-readable-empty-buffer-no-eof.js

diff --git a/test/simple/test-stream2-readable-from-list.js b/test/parallel/test-stream2-readable-from-list.js
similarity index 100%
rename from test/simple/test-stream2-readable-from-list.js
rename to test/parallel/test-stream2-readable-from-list.js

diff --git a/test/simple/test-stream2-readable-legacy-drain.js b/test/parallel/test-stream2-readable-legacy-drain.js
similarity index 100%
rename from test/simple/test-stream2-readable-legacy-drain.js
rename to test/parallel/test-stream2-readable-legacy-drain.js

diff --git a/test/simple/test-stream2-readable-non-empty-end.js b/test/parallel/test-stream2-readable-non-empty-end.js
similarity index 100%
rename from test/simple/test-stream2-readable-non-empty-end.js
rename to test/parallel/test-stream2-readable-non-empty-end.js

diff --git a/test/simple/test-stream2-readable-wrap-empty.js b/test/parallel/test-stream2-readable-wrap-empty.js
similarity index 100%
rename from test/simple/test-stream2-readable-wrap-empty.js
rename to test/parallel/test-stream2-readable-wrap-empty.js

diff --git a/test/simple/test-stream2-readable-wrap.js b/test/parallel/test-stream2-readable-wrap.js
similarity index 100%
rename from test/simple/test-stream2-readable-wrap.js
rename to test/parallel/test-stream2-readable-wrap.js

diff --git a/test/simple/test-stream2-set-encoding.js b/test/parallel/test-stream2-set-encoding.js
similarity index 100%
rename from test/simple/test-stream2-set-encoding.js
rename to test/parallel/test-stream2-set-encoding.js

diff --git a/test/simple/test-stream2-transform.js b/test/parallel/test-stream2-transform.js
similarity index 100%
rename from test/simple/test-stream2-transform.js
rename to test/parallel/test-stream2-transform.js

diff --git a/test/simple/test-stream2-unpipe-drain.js b/test/parallel/test-stream2-unpipe-drain.js
similarity index 100%
rename from test/simple/test-stream2-unpipe-drain.js
rename to test/parallel/test-stream2-unpipe-drain.js

diff --git a/test/simple/test-stream2-unpipe-leak.js b/test/parallel/test-stream2-unpipe-leak.js
similarity index 100%
rename from test/simple/test-stream2-unpipe-leak.js
rename to test/parallel/test-stream2-unpipe-leak.js

diff --git a/test/simple/test-stream2-writable.js b/test/parallel/test-stream2-writable.js
similarity index 100%
rename from test/simple/test-stream2-writable.js
rename to test/parallel/test-stream2-writable.js

diff --git a/test/simple/test-stream3-pause-then-read.js b/test/parallel/test-stream3-pause-then-read.js
similarity index 100%
rename from test/simple/test-stream3-pause-then-read.js
rename to test/parallel/test-stream3-pause-then-read.js

diff --git a/test/simple/test-string-decoder-end.js b/test/parallel/test-string-decoder-end.js
similarity index 100%
rename from test/simple/test-string-decoder-end.js
rename to test/parallel/test-string-decoder-end.js

diff --git a/test/simple/test-string-decoder.js b/test/parallel/test-string-decoder.js
similarity index 100%
rename from test/simple/test-string-decoder.js
rename to test/parallel/test-string-decoder.js

diff --git a/test/simple/test-stringbytes-external.js b/test/parallel/test-stringbytes-external.js
similarity index 100%
rename from test/simple/test-stringbytes-external.js
rename to test/parallel/test-stringbytes-external.js

diff --git a/test/simple/test-sys.js b/test/parallel/test-sys.js
similarity index 100%
rename from test/simple/test-sys.js
rename to test/parallel/test-sys.js

diff --git a/test/simple/test-tcp-wrap.js b/test/parallel/test-tcp-wrap.js
similarity index 100%
rename from test/simple/test-tcp-wrap.js
rename to test/parallel/test-tcp-wrap.js

diff --git a/test/simple/test-timers-first-fire.js b/test/parallel/test-timers-first-fire.js
similarity index 100%
rename from test/simple/test-timers-first-fire.js
rename to test/parallel/test-timers-first-fire.js

diff --git a/test/simple/test-timers-immediate-queue.js b/test/parallel/test-timers-immediate-queue.js
similarity index 100%
rename from test/simple/test-timers-immediate-queue.js
rename to test/parallel/test-timers-immediate-queue.js

diff --git a/test/simple/test-timers-immediate.js b/test/parallel/test-timers-immediate.js
similarity index 100%
rename from test/simple/test-timers-immediate.js
rename to test/parallel/test-timers-immediate.js

diff --git a/test/simple/test-timers-linked-list.js b/test/parallel/test-timers-linked-list.js
similarity index 100%
rename from test/simple/test-timers-linked-list.js
rename to test/parallel/test-timers-linked-list.js

diff --git a/test/simple/test-timers-non-integer-delay.js b/test/parallel/test-timers-non-integer-delay.js
similarity index 100%
rename from test/simple/test-timers-non-integer-delay.js
rename to test/parallel/test-timers-non-integer-delay.js

diff --git a/test/simple/test-timers-ordering.js b/test/parallel/test-timers-ordering.js
similarity index 100%
rename from test/simple/test-timers-ordering.js
rename to test/parallel/test-timers-ordering.js

diff --git a/test/simple/test-timers-this.js b/test/parallel/test-timers-this.js
similarity index 100%
rename from test/simple/test-timers-this.js
rename to test/parallel/test-timers-this.js

diff --git a/test/simple/test-timers-uncaught-exception.js b/test/parallel/test-timers-uncaught-exception.js
similarity index 100%
rename from test/simple/test-timers-uncaught-exception.js
rename to test/parallel/test-timers-uncaught-exception.js

diff --git a/test/simple/test-timers-unref.js b/test/parallel/test-timers-unref.js
similarity index 100%
rename from test/simple/test-timers-unref.js
rename to test/parallel/test-timers-unref.js

diff --git a/test/simple/test-timers-zero-timeout.js b/test/parallel/test-timers-zero-timeout.js
similarity index 100%
rename from test/simple/test-timers-zero-timeout.js
rename to test/parallel/test-timers-zero-timeout.js

diff --git a/test/simple/test-timers.js b/test/parallel/test-timers.js
similarity index 100%
rename from test/simple/test-timers.js
rename to test/parallel/test-timers.js

diff --git a/test/simple/test-tls-0-dns-altname.js b/test/parallel/test-tls-0-dns-altname.js
similarity index 100%
rename from test/simple/test-tls-0-dns-altname.js
rename to test/parallel/test-tls-0-dns-altname.js

diff --git a/test/simple/test-tls-alert.js b/test/parallel/test-tls-alert.js
similarity index 100%
rename from test/simple/test-tls-alert.js
rename to test/parallel/test-tls-alert.js

diff --git a/test/simple/test-tls-cert-regression.js b/test/parallel/test-tls-cert-regression.js
similarity index 100%
rename from test/simple/test-tls-cert-regression.js
rename to test/parallel/test-tls-cert-regression.js

diff --git a/test/simple/test-tls-check-server-identity.js b/test/parallel/test-tls-check-server-identity.js
similarity index 100%
rename from test/simple/test-tls-check-server-identity.js
rename to test/parallel/test-tls-check-server-identity.js

diff --git a/test/simple/test-tls-client-abort.js b/test/parallel/test-tls-client-abort.js
similarity index 100%
rename from test/simple/test-tls-client-abort.js
rename to test/parallel/test-tls-client-abort.js

diff --git a/test/simple/test-tls-client-abort2.js b/test/parallel/test-tls-client-abort2.js
similarity index 100%
rename from test/simple/test-tls-client-abort2.js
rename to test/parallel/test-tls-client-abort2.js

diff --git a/test/simple/test-tls-client-default-ciphers.js b/test/parallel/test-tls-client-default-ciphers.js
similarity index 100%
rename from test/simple/test-tls-client-default-ciphers.js
rename to test/parallel/test-tls-client-default-ciphers.js

diff --git a/test/simple/test-tls-client-destroy-soon.js b/test/parallel/test-tls-client-destroy-soon.js
similarity index 100%
rename from test/simple/test-tls-client-destroy-soon.js
rename to test/parallel/test-tls-client-destroy-soon.js

diff --git a/test/simple/test-tls-client-reject.js b/test/parallel/test-tls-client-reject.js
similarity index 100%
rename from test/simple/test-tls-client-reject.js
rename to test/parallel/test-tls-client-reject.js

diff --git a/test/simple/test-tls-client-resume.js b/test/parallel/test-tls-client-resume.js
similarity index 100%
rename from test/simple/test-tls-client-resume.js
rename to test/parallel/test-tls-client-resume.js

diff --git a/test/simple/test-tls-client-verify.js b/test/parallel/test-tls-client-verify.js
similarity index 100%
rename from test/simple/test-tls-client-verify.js
rename to test/parallel/test-tls-client-verify.js

diff --git a/test/simple/test-tls-close-notify.js b/test/parallel/test-tls-close-notify.js
similarity index 100%
rename from test/simple/test-tls-close-notify.js
rename to test/parallel/test-tls-close-notify.js

diff --git a/test/simple/test-tls-connect-given-socket.js b/test/parallel/test-tls-connect-given-socket.js
similarity index 100%
rename from test/simple/test-tls-connect-given-socket.js
rename to test/parallel/test-tls-connect-given-socket.js

diff --git a/test/simple/test-tls-connect-pipe.js b/test/parallel/test-tls-connect-pipe.js
similarity index 100%
rename from test/simple/test-tls-connect-pipe.js
rename to test/parallel/test-tls-connect-pipe.js

diff --git a/test/simple/test-tls-connect-simple.js b/test/parallel/test-tls-connect-simple.js
similarity index 100%
rename from test/simple/test-tls-connect-simple.js
rename to test/parallel/test-tls-connect-simple.js

diff --git a/test/simple/test-tls-connect.js b/test/parallel/test-tls-connect.js
similarity index 100%
rename from test/simple/test-tls-connect.js
rename to test/parallel/test-tls-connect.js

diff --git a/test/simple/test-tls-delayed-attach.js b/test/parallel/test-tls-delayed-attach.js
similarity index 100%
rename from test/simple/test-tls-delayed-attach.js
rename to test/parallel/test-tls-delayed-attach.js

diff --git a/test/simple/test-tls-dhe.js b/test/parallel/test-tls-dhe.js
similarity index 100%
rename from test/simple/test-tls-dhe.js
rename to test/parallel/test-tls-dhe.js

diff --git a/test/simple/test-tls-ecdh-disable.js b/test/parallel/test-tls-ecdh-disable.js
similarity index 100%
rename from test/simple/test-tls-ecdh-disable.js
rename to test/parallel/test-tls-ecdh-disable.js

diff --git a/test/simple/test-tls-ecdh.js b/test/parallel/test-tls-ecdh.js
similarity index 100%
rename from test/simple/test-tls-ecdh.js
rename to test/parallel/test-tls-ecdh.js

diff --git a/test/simple/test-tls-econnreset.js b/test/parallel/test-tls-econnreset.js
similarity index 100%
rename from test/simple/test-tls-econnreset.js
rename to test/parallel/test-tls-econnreset.js

diff --git a/test/simple/test-tls-fast-writing.js b/test/parallel/test-tls-fast-writing.js
similarity index 100%
rename from test/simple/test-tls-fast-writing.js
rename to test/parallel/test-tls-fast-writing.js

diff --git a/test/simple/test-tls-friendly-error-message.js b/test/parallel/test-tls-friendly-error-message.js
similarity index 98%
rename from test/simple/test-tls-friendly-error-message.js
rename to test/parallel/test-tls-friendly-error-message.js
index 39fb302..b589907 100644 (file)
--- a/test/simple/test-tls-friendly-error-message.js
+++ b/test/parallel/test-tls-friendly-error-message.js
@@ -35,7 +35,7 @@ var cert = fs.readFileSync(common.fixturesDir + '/keys/agent1-cert.pem');
 tls.createServer({ key: key, cert: cert }, function(conn) {
   conn.end();
   this.close();
-}).listen(0, function() {
+}).listen(common.PORT, function() {
   var options = { port: this.address().port, rejectUnauthorized: true };
   tls.connect(options).on('error', common.mustCall(function(err) {
     assert.equal(err.code, 'UNABLE_TO_VERIFY_LEAF_SIGNATURE');

diff --git a/test/simple/test-tls-getcipher.js b/test/parallel/test-tls-getcipher.js
similarity index 100%
rename from test/simple/test-tls-getcipher.js
rename to test/parallel/test-tls-getcipher.js

diff --git a/test/simple/test-tls-handshake-nohang.js b/test/parallel/test-tls-handshake-nohang.js
similarity index 100%
rename from test/simple/test-tls-handshake-nohang.js
rename to test/parallel/test-tls-handshake-nohang.js

diff --git a/test/simple/test-tls-hello-parser-failure.js b/test/parallel/test-tls-hello-parser-failure.js
similarity index 100%
rename from test/simple/test-tls-hello-parser-failure.js
rename to test/parallel/test-tls-hello-parser-failure.js

diff --git a/test/simple/test-tls-inception.js b/test/parallel/test-tls-inception.js
similarity index 100%
rename from test/simple/test-tls-inception.js
rename to test/parallel/test-tls-inception.js

diff --git a/test/simple/test-tls-interleave.js b/test/parallel/test-tls-interleave.js
similarity index 100%
rename from test/simple/test-tls-interleave.js
rename to test/parallel/test-tls-interleave.js

diff --git a/test/simple/test-tls-invoke-queued.js b/test/parallel/test-tls-invoke-queued.js
similarity index 100%
rename from test/simple/test-tls-invoke-queued.js
rename to test/parallel/test-tls-invoke-queued.js

diff --git a/test/simple/test-tls-junk-closes-server.js b/test/parallel/test-tls-junk-closes-server.js
similarity index 100%
rename from test/simple/test-tls-junk-closes-server.js
rename to test/parallel/test-tls-junk-closes-server.js

diff --git a/test/simple/test-tls-key-mismatch.js b/test/parallel/test-tls-key-mismatch.js
similarity index 100%
rename from test/simple/test-tls-key-mismatch.js
rename to test/parallel/test-tls-key-mismatch.js

diff --git a/test/simple/test-tls-max-send-fragment.js b/test/parallel/test-tls-max-send-fragment.js
similarity index 100%
rename from test/simple/test-tls-max-send-fragment.js
rename to test/parallel/test-tls-max-send-fragment.js

diff --git a/test/simple/test-tls-multi-key.js b/test/parallel/test-tls-multi-key.js
similarity index 100%
rename from test/simple/test-tls-multi-key.js
rename to test/parallel/test-tls-multi-key.js

diff --git a/test/simple/test-tls-no-cert-required.js b/test/parallel/test-tls-no-cert-required.js
similarity index 94%
rename from test/simple/test-tls-no-cert-required.js
rename to test/parallel/test-tls-no-cert-required.js
index 48e6c59..3512147 100644 (file)
--- a/test/simple/test-tls-no-cert-required.js
+++ b/test/parallel/test-tls-no-cert-required.js
@@ -30,6 +30,6 @@ var tls = require('tls');
 // Omitting the cert or pfx option to tls.createServer() should not throw.
 // AECDH-NULL-SHA is a no-authentication/no-encryption cipher and hence
 // doesn't need a certificate.
-tls.createServer({ ciphers: 'AECDH-NULL-SHA' }).listen(0, function() {
+tls.createServer({ ciphers: 'AECDH-NULL-SHA' }).listen(common.PORT, function() {
   this.close();
 });

diff --git a/test/simple/test-tls-no-rsa-key.js b/test/parallel/test-tls-no-rsa-key.js
similarity index 100%
rename from test/simple/test-tls-no-rsa-key.js
rename to test/parallel/test-tls-no-rsa-key.js

diff --git a/test/simple/test-tls-npn-server-client.js b/test/parallel/test-tls-npn-server-client.js
similarity index 100%
rename from test/simple/test-tls-npn-server-client.js
rename to test/parallel/test-tls-npn-server-client.js

diff --git a/test/simple/test-tls-ocsp-callback.js b/test/parallel/test-tls-ocsp-callback.js
similarity index 100%
rename from test/simple/test-tls-ocsp-callback.js
rename to test/parallel/test-tls-ocsp-callback.js

diff --git a/test/simple/test-tls-over-http-tunnel.js b/test/parallel/test-tls-over-http-tunnel.js
similarity index 100%
rename from test/simple/test-tls-over-http-tunnel.js
rename to test/parallel/test-tls-over-http-tunnel.js

diff --git a/test/simple/test-tls-passphrase.js b/test/parallel/test-tls-passphrase.js
similarity index 100%
rename from test/simple/test-tls-passphrase.js
rename to test/parallel/test-tls-passphrase.js

diff --git a/test/simple/test-tls-pause.js b/test/parallel/test-tls-pause.js
similarity index 100%
rename from test/simple/test-tls-pause.js
rename to test/parallel/test-tls-pause.js

diff --git a/test/simple/test-tls-peer-certificate-encoding.js b/test/parallel/test-tls-peer-certificate-encoding.js
similarity index 100%
rename from test/simple/test-tls-peer-certificate-encoding.js
rename to test/parallel/test-tls-peer-certificate-encoding.js

diff --git a/test/simple/test-tls-peer-certificate-multi-keys.js b/test/parallel/test-tls-peer-certificate-multi-keys.js
similarity index 100%
rename from test/simple/test-tls-peer-certificate-multi-keys.js
rename to test/parallel/test-tls-peer-certificate-multi-keys.js

diff --git a/test/simple/test-tls-peer-certificate.js b/test/parallel/test-tls-peer-certificate.js
similarity index 100%
rename from test/simple/test-tls-peer-certificate.js
rename to test/parallel/test-tls-peer-certificate.js

diff --git a/test/simple/test-tls-request-timeout.js b/test/parallel/test-tls-request-timeout.js
similarity index 100%
rename from test/simple/test-tls-request-timeout.js
rename to test/parallel/test-tls-request-timeout.js

diff --git a/test/simple/test-tls-securepair-server.js b/test/parallel/test-tls-securepair-server.js
similarity index 100%
rename from test/simple/test-tls-securepair-server.js
rename to test/parallel/test-tls-securepair-server.js

diff --git a/test/simple/test-tls-server-verify.js b/test/parallel/test-tls-server-verify.js
similarity index 100%
rename from test/simple/test-tls-server-verify.js
rename to test/parallel/test-tls-server-verify.js

diff --git a/test/simple/test-tls-session-cache.js b/test/parallel/test-tls-session-cache.js
similarity index 100%
rename from test/simple/test-tls-session-cache.js
rename to test/parallel/test-tls-session-cache.js

diff --git a/test/simple/test-tls-set-ciphers.js b/test/parallel/test-tls-set-ciphers.js
similarity index 100%
rename from test/simple/test-tls-set-ciphers.js
rename to test/parallel/test-tls-set-ciphers.js

diff --git a/test/simple/test-tls-set-encoding.js b/test/parallel/test-tls-set-encoding.js
similarity index 100%
rename from test/simple/test-tls-set-encoding.js
rename to test/parallel/test-tls-set-encoding.js

diff --git a/test/simple/test-tls-sni-option.js b/test/parallel/test-tls-sni-option.js
similarity index 100%
rename from test/simple/test-tls-sni-option.js
rename to test/parallel/test-tls-sni-option.js

diff --git a/test/simple/test-tls-sni-server-client.js b/test/parallel/test-tls-sni-server-client.js
similarity index 100%
rename from test/simple/test-tls-sni-server-client.js
rename to test/parallel/test-tls-sni-server-client.js

diff --git a/test/simple/test-tls-ticket-cluster.js b/test/parallel/test-tls-ticket-cluster.js
similarity index 100%
rename from test/simple/test-tls-ticket-cluster.js
rename to test/parallel/test-tls-ticket-cluster.js

diff --git a/test/simple/test-tls-ticket.js b/test/parallel/test-tls-ticket.js
similarity index 100%
rename from test/simple/test-tls-ticket.js
rename to test/parallel/test-tls-ticket.js

diff --git a/test/simple/test-tls-timeout-server-2.js b/test/parallel/test-tls-timeout-server-2.js
similarity index 100%
rename from test/simple/test-tls-timeout-server-2.js
rename to test/parallel/test-tls-timeout-server-2.js

diff --git a/test/simple/test-tls-timeout-server.js b/test/parallel/test-tls-timeout-server.js
similarity index 100%
rename from test/simple/test-tls-timeout-server.js
rename to test/parallel/test-tls-timeout-server.js

diff --git a/test/simple/test-tls-zero-clear-in.js b/test/parallel/test-tls-zero-clear-in.js
similarity index 100%
rename from test/simple/test-tls-zero-clear-in.js
rename to test/parallel/test-tls-zero-clear-in.js

diff --git a/test/simple/test-tty-stdout-end.js b/test/parallel/test-tty-stdout-end.js
similarity index 100%
rename from test/simple/test-tty-stdout-end.js
rename to test/parallel/test-tty-stdout-end.js

diff --git a/test/simple/test-tty-wrap.js b/test/parallel/test-tty-wrap.js
similarity index 100%
rename from test/simple/test-tty-wrap.js
rename to test/parallel/test-tty-wrap.js

diff --git a/test/simple/test-umask.js b/test/parallel/test-umask.js
similarity index 100%
rename from test/simple/test-umask.js
rename to test/parallel/test-umask.js

diff --git a/test/simple/test-url.js b/test/parallel/test-url.js
similarity index 100%
rename from test/simple/test-url.js
rename to test/parallel/test-url.js

diff --git a/test/simple/test-utf8-scripts.js b/test/parallel/test-utf8-scripts.js
similarity index 100%
rename from test/simple/test-utf8-scripts.js
rename to test/parallel/test-utf8-scripts.js

diff --git a/test/simple/test-util-format.js b/test/parallel/test-util-format.js
similarity index 100%
rename from test/simple/test-util-format.js
rename to test/parallel/test-util-format.js

diff --git a/test/simple/test-util-inspect.js b/test/parallel/test-util-inspect.js
similarity index 100%
rename from test/simple/test-util-inspect.js
rename to test/parallel/test-util-inspect.js

diff --git a/test/simple/test-util-log.js b/test/parallel/test-util-log.js
similarity index 100%
rename from test/simple/test-util-log.js
rename to test/parallel/test-util-log.js

diff --git a/test/simple/test-util.js b/test/parallel/test-util.js
similarity index 100%
rename from test/simple/test-util.js
rename to test/parallel/test-util.js

diff --git a/test/simple/test-v8-flags.js b/test/parallel/test-v8-flags.js
similarity index 100%
rename from test/simple/test-v8-flags.js
rename to test/parallel/test-v8-flags.js

diff --git a/test/simple/test-v8-gc.js b/test/parallel/test-v8-gc.js
similarity index 100%
rename from test/simple/test-v8-gc.js
rename to test/parallel/test-v8-gc.js

diff --git a/test/simple/test-v8-stats.js b/test/parallel/test-v8-stats.js
similarity index 100%
rename from test/simple/test-v8-stats.js
rename to test/parallel/test-v8-stats.js

diff --git a/test/simple/test-vm-basic.js b/test/parallel/test-vm-basic.js
similarity index 100%
rename from test/simple/test-vm-basic.js
rename to test/parallel/test-vm-basic.js

diff --git a/test/simple/test-vm-context-async-script.js b/test/parallel/test-vm-context-async-script.js
similarity index 100%
rename from test/simple/test-vm-context-async-script.js
rename to test/parallel/test-vm-context-async-script.js

diff --git a/test/simple/test-vm-context-property-forwarding.js b/test/parallel/test-vm-context-property-forwarding.js
similarity index 100%
rename from test/simple/test-vm-context-property-forwarding.js
rename to test/parallel/test-vm-context-property-forwarding.js

diff --git a/test/simple/test-vm-context.js b/test/parallel/test-vm-context.js
similarity index 100%
rename from test/simple/test-vm-context.js
rename to test/parallel/test-vm-context.js

diff --git a/test/simple/test-vm-create-and-run-in-context.js b/test/parallel/test-vm-create-and-run-in-context.js
similarity index 100%
rename from test/simple/test-vm-create-and-run-in-context.js
rename to test/parallel/test-vm-create-and-run-in-context.js

diff --git a/test/simple/test-vm-create-context-accessors.js b/test/parallel/test-vm-create-context-accessors.js
similarity index 100%
rename from test/simple/test-vm-create-context-accessors.js
rename to test/parallel/test-vm-create-context-accessors.js

diff --git a/test/simple/test-vm-create-context-arg.js b/test/parallel/test-vm-create-context-arg.js
similarity index 100%
rename from test/simple/test-vm-create-context-arg.js
rename to test/parallel/test-vm-create-context-arg.js

diff --git a/test/simple/test-vm-create-context-circular-reference.js b/test/parallel/test-vm-create-context-circular-reference.js
similarity index 100%
rename from test/simple/test-vm-create-context-circular-reference.js
rename to test/parallel/test-vm-create-context-circular-reference.js

diff --git a/test/simple/test-vm-cross-context.js b/test/parallel/test-vm-cross-context.js
similarity index 100%
rename from test/simple/test-vm-cross-context.js
rename to test/parallel/test-vm-cross-context.js

diff --git a/test/simple/test-vm-debug-context.js b/test/parallel/test-vm-debug-context.js
similarity index 100%
rename from test/simple/test-vm-debug-context.js
rename to test/parallel/test-vm-debug-context.js

diff --git a/test/simple/test-vm-function-declaration.js b/test/parallel/test-vm-function-declaration.js
similarity index 100%
rename from test/simple/test-vm-function-declaration.js
rename to test/parallel/test-vm-function-declaration.js

diff --git a/test/simple/test-vm-global-define-property.js b/test/parallel/test-vm-global-define-property.js
similarity index 100%
rename from test/simple/test-vm-global-define-property.js
rename to test/parallel/test-vm-global-define-property.js

diff --git a/test/simple/test-vm-global-identity.js b/test/parallel/test-vm-global-identity.js
similarity index 100%
rename from test/simple/test-vm-global-identity.js
rename to test/parallel/test-vm-global-identity.js

diff --git a/test/simple/test-vm-harmony-proxies.js b/test/parallel/test-vm-harmony-proxies.js
similarity index 100%
rename from test/simple/test-vm-harmony-proxies.js
rename to test/parallel/test-vm-harmony-proxies.js

diff --git a/test/simple/test-vm-harmony-symbols.js b/test/parallel/test-vm-harmony-symbols.js
similarity index 100%
rename from test/simple/test-vm-harmony-symbols.js
rename to test/parallel/test-vm-harmony-symbols.js

diff --git a/test/simple/test-vm-is-context.js b/test/parallel/test-vm-is-context.js
similarity index 100%
rename from test/simple/test-vm-is-context.js
rename to test/parallel/test-vm-is-context.js

diff --git a/test/simple/test-vm-new-script-new-context.js b/test/parallel/test-vm-new-script-new-context.js
similarity index 100%
rename from test/simple/test-vm-new-script-new-context.js
rename to test/parallel/test-vm-new-script-new-context.js

diff --git a/test/simple/test-vm-new-script-this-context.js b/test/parallel/test-vm-new-script-this-context.js
similarity index 100%
rename from test/simple/test-vm-new-script-this-context.js
rename to test/parallel/test-vm-new-script-this-context.js

diff --git a/test/simple/test-vm-run-in-new-context.js b/test/parallel/test-vm-run-in-new-context.js
similarity index 100%
rename from test/simple/test-vm-run-in-new-context.js
rename to test/parallel/test-vm-run-in-new-context.js

diff --git a/test/simple/test-vm-static-this.js b/test/parallel/test-vm-static-this.js
similarity index 100%
rename from test/simple/test-vm-static-this.js
rename to test/parallel/test-vm-static-this.js

diff --git a/test/simple/test-vm-timeout.js b/test/parallel/test-vm-timeout.js
similarity index 100%
rename from test/simple/test-vm-timeout.js
rename to test/parallel/test-vm-timeout.js

diff --git a/test/simple/test-writedouble.js b/test/parallel/test-writedouble.js
similarity index 100%
rename from test/simple/test-writedouble.js
rename to test/parallel/test-writedouble.js

diff --git a/test/simple/test-writefloat.js b/test/parallel/test-writefloat.js
similarity index 100%
rename from test/simple/test-writefloat.js
rename to test/parallel/test-writefloat.js

diff --git a/test/simple/test-writeint.js b/test/parallel/test-writeint.js
similarity index 100%
rename from test/simple/test-writeint.js
rename to test/parallel/test-writeint.js

diff --git a/test/simple/test-writeuint.js b/test/parallel/test-writeuint.js
similarity index 100%
rename from test/simple/test-writeuint.js
rename to test/parallel/test-writeuint.js

diff --git a/test/simple/test-zlib-close-after-write.js b/test/parallel/test-zlib-close-after-write.js
similarity index 100%
rename from test/simple/test-zlib-close-after-write.js
rename to test/parallel/test-zlib-close-after-write.js

diff --git a/test/simple/test-zlib-convenience-methods.js b/test/parallel/test-zlib-convenience-methods.js
similarity index 100%
rename from test/simple/test-zlib-convenience-methods.js
rename to test/parallel/test-zlib-convenience-methods.js

diff --git a/test/simple/test-zlib-dictionary-fail.js b/test/parallel/test-zlib-dictionary-fail.js
similarity index 100%
rename from test/simple/test-zlib-dictionary-fail.js
rename to test/parallel/test-zlib-dictionary-fail.js

diff --git a/test/simple/test-zlib-dictionary.js b/test/parallel/test-zlib-dictionary.js
similarity index 100%
rename from test/simple/test-zlib-dictionary.js
rename to test/parallel/test-zlib-dictionary.js

diff --git a/test/simple/test-zlib-flush.js b/test/parallel/test-zlib-flush.js
similarity index 100%
rename from test/simple/test-zlib-flush.js
rename to test/parallel/test-zlib-flush.js

diff --git a/test/simple/test-zlib-from-gzip.js b/test/parallel/test-zlib-from-gzip.js
similarity index 100%
rename from test/simple/test-zlib-from-gzip.js
rename to test/parallel/test-zlib-from-gzip.js

diff --git a/test/simple/test-zlib-from-multiple-gzip-with-garbage.js b/test/parallel/test-zlib-from-multiple-gzip-with-garbage.js
similarity index 100%
rename from test/simple/test-zlib-from-multiple-gzip-with-garbage.js
rename to test/parallel/test-zlib-from-multiple-gzip-with-garbage.js

diff --git a/test/simple/test-zlib-from-multiple-gzip.js b/test/parallel/test-zlib-from-multiple-gzip.js
similarity index 100%
rename from test/simple/test-zlib-from-multiple-gzip.js
rename to test/parallel/test-zlib-from-multiple-gzip.js

diff --git a/test/simple/test-zlib-from-multiple-huge-gzip.js b/test/parallel/test-zlib-from-multiple-huge-gzip.js
similarity index 100%
rename from test/simple/test-zlib-from-multiple-huge-gzip.js
rename to test/parallel/test-zlib-from-multiple-huge-gzip.js

diff --git a/test/simple/test-zlib-from-string.js b/test/parallel/test-zlib-from-string.js
similarity index 100%
rename from test/simple/test-zlib-from-string.js
rename to test/parallel/test-zlib-from-string.js

diff --git a/test/simple/test-zlib-invalid-input.js b/test/parallel/test-zlib-invalid-input.js
similarity index 100%
rename from test/simple/test-zlib-invalid-input.js
rename to test/parallel/test-zlib-invalid-input.js

diff --git a/test/simple/test-zlib-params.js b/test/parallel/test-zlib-params.js
similarity index 100%
rename from test/simple/test-zlib-params.js
rename to test/parallel/test-zlib-params.js

diff --git a/test/simple/test-zlib-random-byte-pipes.js b/test/parallel/test-zlib-random-byte-pipes.js
similarity index 100%
rename from test/simple/test-zlib-random-byte-pipes.js
rename to test/parallel/test-zlib-random-byte-pipes.js

diff --git a/test/simple/test-zlib-write-after-close.js b/test/parallel/test-zlib-write-after-close.js
similarity index 100%
rename from test/simple/test-zlib-write-after-close.js
rename to test/parallel/test-zlib-write-after-close.js

diff --git a/test/simple/test-zlib-write-after-flush.js b/test/parallel/test-zlib-write-after-flush.js
similarity index 100%
rename from test/simple/test-zlib-write-after-flush.js
rename to test/parallel/test-zlib-write-after-flush.js

diff --git a/test/simple/test-zlib-zero-byte.js b/test/parallel/test-zlib-zero-byte.js
similarity index 100%
rename from test/simple/test-zlib-zero-byte.js
rename to test/parallel/test-zlib-zero-byte.js

diff --git a/test/simple/test-zlib.js b/test/parallel/test-zlib.js
similarity index 100%
rename from test/simple/test-zlib.js
rename to test/parallel/test-zlib.js

diff --git a/test/simple/testcfg.py b/test/parallel/testcfg.py
similarity index 65%
rename from test/simple/testcfg.py
rename to test/parallel/testcfg.py
index 3d9b629..8b610b5 100644 (file)
--- a/test/simple/testcfg.py
+++ b/test/parallel/testcfg.py
@@ -3,4 +3,4 @@ sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
 import testpy
 
 def GetConfiguration(context, root):
-  return testpy.SimpleTestConfiguration(context, root, 'simple')
+  return testpy.ParallelTestConfiguration(context, root, 'parallel')

diff --git a/test/simple/test-chdir.js b/test/sequential/test-chdir.js
similarity index 100%
rename from test/simple/test-chdir.js
rename to test/sequential/test-chdir.js

diff --git a/test/simple/test-child-process-emfile.js b/test/sequential/test-child-process-emfile.js
similarity index 100%
rename from test/simple/test-child-process-emfile.js
rename to test/sequential/test-child-process-emfile.js

diff --git a/test/simple/test-child-process-execsync.js b/test/sequential/test-child-process-execsync.js
similarity index 100%
rename from test/simple/test-child-process-execsync.js
rename to test/sequential/test-child-process-execsync.js

diff --git a/test/simple/test-child-process-fork-getconnections.js b/test/sequential/test-child-process-fork-getconnections.js
similarity index 100%
rename from test/simple/test-child-process-fork-getconnections.js
rename to test/sequential/test-child-process-fork-getconnections.js

diff --git a/test/simple/test-cluster-listening-port.js b/test/sequential/test-cluster-listening-port.js
similarity index 100%
rename from test/simple/test-cluster-listening-port.js
rename to test/sequential/test-cluster-listening-port.js

diff --git a/test/simple/test-debug-args.js b/test/sequential/test-debug-args.js
similarity index 100%
rename from test/simple/test-debug-args.js
rename to test/sequential/test-debug-args.js

diff --git a/test/simple/test-debug-cluster.js b/test/sequential/test-debug-cluster.js
similarity index 100%
rename from test/simple/test-debug-cluster.js
rename to test/sequential/test-debug-cluster.js

diff --git a/test/simple/test-debug-port-cluster.js b/test/sequential/test-debug-port-cluster.js
similarity index 100%
rename from test/simple/test-debug-port-cluster.js
rename to test/sequential/test-debug-port-cluster.js

diff --git a/test/simple/test-debug-port-from-cmdline.js b/test/sequential/test-debug-port-from-cmdline.js
similarity index 100%
rename from test/simple/test-debug-port-from-cmdline.js
rename to test/sequential/test-debug-port-from-cmdline.js

diff --git a/test/simple/test-debug-signal-cluster.js b/test/sequential/test-debug-signal-cluster.js
similarity index 100%
rename from test/simple/test-debug-signal-cluster.js
rename to test/sequential/test-debug-signal-cluster.js

diff --git a/test/simple/test-deprecation-flags.js b/test/sequential/test-deprecation-flags.js
similarity index 100%
rename from test/simple/test-deprecation-flags.js
rename to test/sequential/test-deprecation-flags.js

diff --git a/test/simple/test-force-repl.js b/test/sequential/test-force-repl.js
similarity index 100%
rename from test/simple/test-force-repl.js
rename to test/sequential/test-force-repl.js

diff --git a/test/simple/test-fs-watch-recursive.js b/test/sequential/test-fs-watch-recursive.js
similarity index 100%
rename from test/simple/test-fs-watch-recursive.js
rename to test/sequential/test-fs-watch-recursive.js

diff --git a/test/simple/test-fs-watch.js b/test/sequential/test-fs-watch.js
similarity index 100%
rename from test/simple/test-fs-watch.js
rename to test/sequential/test-fs-watch.js

diff --git a/test/simple/test-http-pipeline-flood.js b/test/sequential/test-http-pipeline-flood.js
similarity index 100%
rename from test/simple/test-http-pipeline-flood.js
rename to test/sequential/test-http-pipeline-flood.js

diff --git a/test/simple/test-init.js b/test/sequential/test-init.js
similarity index 100%
rename from test/simple/test-init.js
rename to test/sequential/test-init.js

diff --git a/test/simple/test-memory-usage-emfile.js b/test/sequential/test-memory-usage-emfile.js
similarity index 100%
rename from test/simple/test-memory-usage-emfile.js
rename to test/sequential/test-memory-usage-emfile.js

diff --git a/test/simple/test-mkdir-rmdir.js b/test/sequential/test-mkdir-rmdir.js
similarity index 100%
rename from test/simple/test-mkdir-rmdir.js
rename to test/sequential/test-mkdir-rmdir.js

diff --git a/test/simple/test-module-loading.js b/test/sequential/test-module-loading.js
similarity index 99%
rename from test/simple/test-module-loading.js
rename to test/sequential/test-module-loading.js
index 8687c3b..c923d56 100644 (file)
--- a/test/simple/test-module-loading.js
+++ b/test/sequential/test-module-loading.js
@@ -110,7 +110,7 @@ require('../fixtures/node_modules/foo');
 
 common.debug('test name clashes');
 // this one exists and should import the local module
-var my_path = require('./path');
+var my_path = require('../fixtures/path');
 assert.ok(common.indirectInstanceOf(my_path.path_func, Function));
 // this one does not exist and should throw
 assert.throws(function() { require('./utils')});
@@ -246,7 +246,7 @@ assert.deepEqual(children, {
       'fixtures/node_modules/baz/node_modules/asdf.js': {}
     }
   },
-  'simple/path.js': {},
+  'fixtures/path.js': {},
   'fixtures/throws_error.js': {},
   'fixtures/registerExt.test': {},
   'fixtures/registerExt.hello.world': {},

diff --git a/test/simple/test-net-GH-5504.js b/test/sequential/test-net-GH-5504.js
similarity index 100%
rename from test/simple/test-net-GH-5504.js
rename to test/sequential/test-net-GH-5504.js

diff --git a/test/simple/test-net-listen-exclusive-random-ports.js b/test/sequential/test-net-listen-exclusive-random-ports.js
similarity index 100%
rename from test/simple/test-net-listen-exclusive-random-ports.js
rename to test/sequential/test-net-listen-exclusive-random-ports.js

diff --git a/test/simple/test-net-localport.js b/test/sequential/test-net-localport.js
similarity index 100%
rename from test/simple/test-net-localport.js
rename to test/sequential/test-net-localport.js

diff --git a/test/simple/test-net-server-address.js b/test/sequential/test-net-server-address.js
similarity index 100%
rename from test/simple/test-net-server-address.js
rename to test/sequential/test-net-server-address.js

diff --git a/test/simple/test-net-server-bind.js b/test/sequential/test-net-server-bind.js
similarity index 100%
rename from test/simple/test-net-server-bind.js
rename to test/sequential/test-net-server-bind.js

diff --git a/test/simple/test-next-tick-error-spin.js b/test/sequential/test-next-tick-error-spin.js
similarity index 100%
rename from test/simple/test-next-tick-error-spin.js
rename to test/sequential/test-next-tick-error-spin.js

diff --git a/test/simple/test-pipe-address.js b/test/sequential/test-pipe-address.js
similarity index 100%
rename from test/simple/test-pipe-address.js
rename to test/sequential/test-pipe-address.js

diff --git a/test/simple/test-pipe-head.js b/test/sequential/test-pipe-head.js
similarity index 100%
rename from test/simple/test-pipe-head.js
rename to test/sequential/test-pipe-head.js

diff --git a/test/simple/test-pipe-stream.js b/test/sequential/test-pipe-stream.js
similarity index 100%
rename from test/simple/test-pipe-stream.js
rename to test/sequential/test-pipe-stream.js

diff --git a/test/simple/test-pipe-unref.js b/test/sequential/test-pipe-unref.js
similarity index 100%
rename from test/simple/test-pipe-unref.js
rename to test/sequential/test-pipe-unref.js

diff --git a/test/simple/test-pipe.js b/test/sequential/test-pipe.js
similarity index 100%
rename from test/simple/test-pipe.js
rename to test/sequential/test-pipe.js

diff --git a/test/simple/test-pump-file2tcp-noexist.js b/test/sequential/test-pump-file2tcp-noexist.js
similarity index 100%
rename from test/simple/test-pump-file2tcp-noexist.js
rename to test/sequential/test-pump-file2tcp-noexist.js

diff --git a/test/simple/test-pump-file2tcp.js b/test/sequential/test-pump-file2tcp.js
similarity index 100%
rename from test/simple/test-pump-file2tcp.js
rename to test/sequential/test-pump-file2tcp.js

diff --git a/test/simple/test-readdir.js b/test/sequential/test-readdir.js
similarity index 100%
rename from test/simple/test-readdir.js
rename to test/sequential/test-readdir.js

diff --git a/test/simple/test-regress-GH-1531.js b/test/sequential/test-regress-GH-1531.js
similarity index 100%
rename from test/simple/test-regress-GH-1531.js
rename to test/sequential/test-regress-GH-1531.js

diff --git a/test/simple/test-regress-GH-1697.js b/test/sequential/test-regress-GH-1697.js
similarity index 100%
rename from test/simple/test-regress-GH-1697.js
rename to test/sequential/test-regress-GH-1697.js

diff --git a/test/simple/test-regress-GH-1726.js b/test/sequential/test-regress-GH-1726.js
similarity index 100%
rename from test/simple/test-regress-GH-1726.js
rename to test/sequential/test-regress-GH-1726.js

diff --git a/test/simple/test-regress-GH-1899.js b/test/sequential/test-regress-GH-1899.js
similarity index 100%
rename from test/simple/test-regress-GH-1899.js
rename to test/sequential/test-regress-GH-1899.js

diff --git a/test/simple/test-regress-GH-3542.js b/test/sequential/test-regress-GH-3542.js
similarity index 100%
rename from test/simple/test-regress-GH-3542.js
rename to test/sequential/test-regress-GH-3542.js

diff --git a/test/simple/test-regress-GH-3739.js b/test/sequential/test-regress-GH-3739.js
similarity index 100%
rename from test/simple/test-regress-GH-3739.js
rename to test/sequential/test-regress-GH-3739.js

diff --git a/test/simple/test-regress-GH-4015.js b/test/sequential/test-regress-GH-4015.js
similarity index 100%
rename from test/simple/test-regress-GH-4015.js
rename to test/sequential/test-regress-GH-4015.js

diff --git a/test/simple/test-regress-GH-4027.js b/test/sequential/test-regress-GH-4027.js
similarity index 100%
rename from test/simple/test-regress-GH-4027.js
rename to test/sequential/test-regress-GH-4027.js

diff --git a/test/simple/test-regress-GH-4948.js b/test/sequential/test-regress-GH-4948.js
similarity index 100%
rename from test/simple/test-regress-GH-4948.js
rename to test/sequential/test-regress-GH-4948.js

diff --git a/test/simple/test-regress-GH-746.js b/test/sequential/test-regress-GH-746.js
similarity index 100%
rename from test/simple/test-regress-GH-746.js
rename to test/sequential/test-regress-GH-746.js

diff --git a/test/simple/test-regress-GH-784.js b/test/sequential/test-regress-GH-784.js
similarity index 100%
rename from test/simple/test-regress-GH-784.js
rename to test/sequential/test-regress-GH-784.js

diff --git a/test/simple/test-regress-GH-819.js b/test/sequential/test-regress-GH-819.js
similarity index 100%
rename from test/simple/test-regress-GH-819.js
rename to test/sequential/test-regress-GH-819.js

diff --git a/test/simple/test-regress-GH-877.js b/test/sequential/test-regress-GH-877.js
similarity index 100%
rename from test/simple/test-regress-GH-877.js
rename to test/sequential/test-regress-GH-877.js

diff --git a/test/simple/test-require-cache-without-stat.js b/test/sequential/test-require-cache-without-stat.js
similarity index 100%
rename from test/simple/test-require-cache-without-stat.js
rename to test/sequential/test-require-cache-without-stat.js

diff --git a/test/simple/test-setproctitle.js b/test/sequential/test-setproctitle.js
similarity index 100%
rename from test/simple/test-setproctitle.js
rename to test/sequential/test-setproctitle.js

diff --git a/test/simple/test-sigint-infinite-loop.js b/test/sequential/test-sigint-infinite-loop.js
similarity index 100%
rename from test/simple/test-sigint-infinite-loop.js
rename to test/sequential/test-sigint-infinite-loop.js

diff --git a/test/simple/test-signal-unregister.js b/test/sequential/test-signal-unregister.js
similarity index 100%
rename from test/simple/test-signal-unregister.js
rename to test/sequential/test-signal-unregister.js

diff --git a/test/simple/test-socket-write-after-fin-error.js b/test/sequential/test-socket-write-after-fin-error.js
similarity index 100%
rename from test/simple/test-socket-write-after-fin-error.js
rename to test/sequential/test-socket-write-after-fin-error.js

diff --git a/test/simple/test-socket-write-after-fin.js b/test/sequential/test-socket-write-after-fin.js
similarity index 100%
rename from test/simple/test-socket-write-after-fin.js
rename to test/sequential/test-socket-write-after-fin.js

diff --git a/test/simple/test-stdin-child-proc.js b/test/sequential/test-stdin-child-proc.js
similarity index 100%
rename from test/simple/test-stdin-child-proc.js
rename to test/sequential/test-stdin-child-proc.js

diff --git a/test/simple/test-stdin-from-file.js b/test/sequential/test-stdin-from-file.js
similarity index 100%
rename from test/simple/test-stdin-from-file.js
rename to test/sequential/test-stdin-from-file.js

diff --git a/test/simple/test-stdin-pipe-resume.js b/test/sequential/test-stdin-pipe-resume.js
similarity index 100%
rename from test/simple/test-stdin-pipe-resume.js
rename to test/sequential/test-stdin-pipe-resume.js

diff --git a/test/simple/test-stdin-script-child.js b/test/sequential/test-stdin-script-child.js
similarity index 100%
rename from test/simple/test-stdin-script-child.js
rename to test/sequential/test-stdin-script-child.js

diff --git a/test/simple/test-stdout-cannot-be-closed-child-process-pipe.js b/test/sequential/test-stdout-cannot-be-closed-child-process-pipe.js
similarity index 100%
rename from test/simple/test-stdout-cannot-be-closed-child-process-pipe.js
rename to test/sequential/test-stdout-cannot-be-closed-child-process-pipe.js

diff --git a/test/simple/test-stdout-close-catch.js b/test/sequential/test-stdout-close-catch.js
similarity index 100%
rename from test/simple/test-stdout-close-catch.js
rename to test/sequential/test-stdout-close-catch.js

diff --git a/test/simple/test-stdout-stderr-reading.js b/test/sequential/test-stdout-stderr-reading.js
similarity index 100%
rename from test/simple/test-stdout-stderr-reading.js
rename to test/sequential/test-stdout-stderr-reading.js

diff --git a/test/simple/test-stdout-to-file.js b/test/sequential/test-stdout-to-file.js
similarity index 100%
rename from test/simple/test-stdout-to-file.js
rename to test/sequential/test-stdout-to-file.js

diff --git a/test/simple/test-stream2-fs.js b/test/sequential/test-stream2-fs.js
similarity index 100%
rename from test/simple/test-stream2-fs.js
rename to test/sequential/test-stream2-fs.js

diff --git a/test/simple/test-stream2-httpclient-response-end.js b/test/sequential/test-stream2-httpclient-response-end.js
similarity index 100%
rename from test/simple/test-stream2-httpclient-response-end.js
rename to test/sequential/test-stream2-httpclient-response-end.js

diff --git a/test/simple/test-stream2-stderr-sync.js b/test/sequential/test-stream2-stderr-sync.js
similarity index 100%
rename from test/simple/test-stream2-stderr-sync.js
rename to test/sequential/test-stream2-stderr-sync.js

diff --git a/test/simple/test-sync-fileread.js b/test/sequential/test-sync-fileread.js
similarity index 100%
rename from test/simple/test-sync-fileread.js
rename to test/sequential/test-sync-fileread.js

diff --git a/test/simple/test-tcp-wrap-connect.js b/test/sequential/test-tcp-wrap-connect.js
similarity index 100%
rename from test/simple/test-tcp-wrap-connect.js
rename to test/sequential/test-tcp-wrap-connect.js

diff --git a/test/simple/test-tcp-wrap-listen.js b/test/sequential/test-tcp-wrap-listen.js
similarity index 100%
rename from test/simple/test-tcp-wrap-listen.js
rename to test/sequential/test-tcp-wrap-listen.js

diff --git a/test/simple/test-tls-honorcipherorder.js b/test/sequential/test-tls-honorcipherorder.js
similarity index 100%
rename from test/simple/test-tls-honorcipherorder.js
rename to test/sequential/test-tls-honorcipherorder.js

diff --git a/test/simple/test-util-debug.js b/test/sequential/test-util-debug.js
similarity index 100%
rename from test/simple/test-util-debug.js
rename to test/sequential/test-util-debug.js

diff --git a/test/simple/test-vm-syntax-error-stderr.js b/test/sequential/test-vm-syntax-error-stderr.js
similarity index 100%
rename from test/simple/test-vm-syntax-error-stderr.js
rename to test/sequential/test-vm-syntax-error-stderr.js

diff --git a/test/simple/test-vm-timeout-rethrow.js b/test/sequential/test-vm-timeout-rethrow.js
similarity index 100%
rename from test/simple/test-vm-timeout-rethrow.js
rename to test/sequential/test-vm-timeout-rethrow.js

diff --git a/test/simple/test-zerolengthbufferbug.js b/test/sequential/test-zerolengthbufferbug.js
similarity index 100%
rename from test/simple/test-zerolengthbufferbug.js
rename to test/sequential/test-zerolengthbufferbug.js

diff --git a/test/sequential/testcfg.py b/test/sequential/testcfg.py
new file mode 100644 (file)
index 0000000..b1fce18
--- /dev/null
+++ b/test/sequential/testcfg.py
@@ -0,0 +1,6 @@
+import sys, os
+sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
+import testpy
+
+def GetConfiguration(context, root):
+  return testpy.SimpleTestConfiguration(context, root, 'sequential')

diff --git a/test/simple/net-socket-readystate.js b/test/simple/net-socket-readystate.js
deleted file mode 100644 (file)
index 107d68e..0000000
--- a/test/simple/net-socket-readystate.js
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright Joyent, Inc. and other Node contributors.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to permit
-// persons to whom the Software is furnished to do so, subject to the
-// following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-// USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-var common = require('../common');
-var net = require('net');
-var assert = require('assert');
-
-var sock = new net.Socket();
-
-var server = net.createServer().listen(common.PORT, function() {
-  assert(!sock.readable);
-  assert(!sock.writable);
-  assert.equal(sock.readyState, 'closed');
-
-  sock.connect(common.PORT, function() {
-    assert.equal(sock.readable, true);
-    assert.equal(sock.writable, true);
-    assert.equal(sock.readyState, 'open');
-
-    sock.end();
-    assert(!sock.writable);
-    assert.equal(sock.readyState, 'readOnly');
-
-    server.close();
-    sock.on('close', function() {
-      assert(!sock.readable);
-      assert(!sock.writable);
-      assert.equal(sock.readyState, 'closed');
-    });
-  });
-
-  assert.equal(sock.readyState, 'opening');
-});

diff --git a/tools/test.py b/tools/test.py
index 94792e2..cb60fbd 100755 (executable)
--- a/tools/test.py
+++ b/tools/test.py
@@ -1317,7 +1317,8 @@ def GetSpecialCommandProcessor(value):
 
 
 BUILT_IN_TESTS = [
-  'simple',
+  'sequential',
+  'parallel',
   'pummel',
   'message',
   'internet',

diff --git a/vcbuild.bat b/vcbuild.bat
index 90cfc54..ab46819 100644 (file)
--- a/vcbuild.bat
+++ b/vcbuild.bat
@@ -163,10 +163,10 @@ if "%test%"=="" goto exit
 if "%config%"=="Debug" set test_args=--mode=debug
 if "%config%"=="Release" set test_args=--mode=release
 
-if "%test%"=="test" set test_args=%test_args% simple message
+if "%test%"=="test" set test_args=%test_args% sequential parallel message
 if "%test%"=="test-internet" set test_args=%test_args% internet
 if "%test%"=="test-pummel" set test_args=%test_args% pummel
-if "%test%"=="test-simple" set test_args=%test_args% simple
+if "%test%"=="test-simple" set test_args=%test_args% sequential parallel
 if "%test%"=="test-message" set test_args=%test_args% message
 if "%test%"=="test-gc" set test_args=%test_args% gc
 if "%test%"=="test-all" set test_args=%test_args%