From 4b8f503fac60623be3123dbf6421abb735ece7af Mon Sep 17 00:00:00 2001 From: Ryan Dahl Date: Sun, 20 Sep 2009 18:19:33 +0200 Subject: [PATCH] Move mjsunit.js to system module directory. --- {test/mjsunit => lib}/mjsunit.js | 0 test/mjsunit/common.js | 13 +++++++++++++ test/mjsunit/test-encode-utf8.js | 2 +- test/mjsunit/test-event-emitter-add-listeners.js | 2 +- test/mjsunit/test-exec.js | 2 +- test/mjsunit/test-file-cat-noexist.js | 7 +++---- test/mjsunit/test-fs-stat.js | 2 +- test/mjsunit/test-fs-write.js | 6 ++---- test/mjsunit/test-http-cat.js | 2 +- test/mjsunit/test-http-client-race.js | 2 +- test/mjsunit/test-http-client-upload.js | 2 +- test/mjsunit/test-http-malformed-request.js | 2 +- test/mjsunit/test-http-proxy.js | 2 +- test/mjsunit/test-http-server.js | 2 +- test/mjsunit/test-http.js | 2 +- test/mjsunit/test-mkdir-rmdir.js | 2 +- test/mjsunit/test-module-loading.js | 2 +- test/mjsunit/test-node-cat.js | 2 +- test/mjsunit/test-process-buffering.js | 2 +- test/mjsunit/test-process-kill.js | 2 +- test/mjsunit/test-process-simple.js | 2 +- test/mjsunit/test-process-spawn-loop.js | 2 +- test/mjsunit/test-promise-wait.js | 2 +- test/mjsunit/test-readdir.js | 10 +++------- test/mjsunit/test-tcp-many-clients.js | 2 +- test/mjsunit/test-tcp-pingpong-delay.js | 2 +- test/mjsunit/test-tcp-pingpong.js | 2 +- test/mjsunit/test-tcp-raw.js | 2 +- test/mjsunit/test-tcp-raws.js | 2 +- test/mjsunit/test-tcp-reconnect.js | 2 +- test/mjsunit/test-tcp-throttle-kernel-buffer.js | 2 +- test/mjsunit/test-tcp-throttle.js | 2 +- test/mjsunit/test-tcp-timeout.js | 2 +- test/mjsunit/test-timers.js | 2 +- test/mjsunit/test-utf8-scripts.js | 2 +- test/mjsunit/test-wait-ordering.js | 2 +- wscript | 1 + 37 files changed, 53 insertions(+), 46 deletions(-) rename {test/mjsunit => lib}/mjsunit.js (100%) create mode 100644 test/mjsunit/common.js diff --git a/test/mjsunit/mjsunit.js b/lib/mjsunit.js similarity index 100% rename from test/mjsunit/mjsunit.js rename to lib/mjsunit.js diff --git a/test/mjsunit/common.js b/test/mjsunit/common.js new file mode 100644 index 0000000..d7e0808 --- /dev/null +++ b/test/mjsunit/common.js @@ -0,0 +1,13 @@ +exports.testDir = node.path.dirname(__filename); +exports.fixturesDir = node.path.join(exports.testDir, "fixtures"); +exports.libDir = node.path.join(exports.testDir, "../../lib"); + +node.libraryPaths.unshift(exports.libDir); + +var mjsunit = require("/mjsunit.js"); +// Copy mjsunit namespace out +for (var prop in mjsunit) { + if (mjsunit.hasOwnProperty(prop)) exports[prop] = mjsunit[prop]; +} + + diff --git a/test/mjsunit/test-encode-utf8.js b/test/mjsunit/test-encode-utf8.js index 9e63cbe..374ead6 100644 --- a/test/mjsunit/test-encode-utf8.js +++ b/test/mjsunit/test-encode-utf8.js @@ -1,4 +1,4 @@ -include("mjsunit.js"); +include("common.js"); var a = [116,101,115,116,32,206,163,207,131,207,128,206,177,32,226,161,140,226,160, 129,226,160,167,226,160,145]; var s = node.encodeUtf8(a); diff --git a/test/mjsunit/test-event-emitter-add-listeners.js b/test/mjsunit/test-event-emitter-add-listeners.js index 20042d6..fa392c6 100644 --- a/test/mjsunit/test-event-emitter-add-listeners.js +++ b/test/mjsunit/test-event-emitter-add-listeners.js @@ -1,4 +1,4 @@ -include("mjsunit.js"); +include("common.js"); var e = new node.EventEmitter(); diff --git a/test/mjsunit/test-exec.js b/test/mjsunit/test-exec.js index b0d008a..9420024 100644 --- a/test/mjsunit/test-exec.js +++ b/test/mjsunit/test-exec.js @@ -1,4 +1,4 @@ -include("mjsunit.js"); +include("common.js"); success_count = 0; error_count = 0; diff --git a/test/mjsunit/test-file-cat-noexist.js b/test/mjsunit/test-file-cat-noexist.js index a98eb8e..c36b991 100644 --- a/test/mjsunit/test-file-cat-noexist.js +++ b/test/mjsunit/test-file-cat-noexist.js @@ -1,9 +1,7 @@ -include("mjsunit.js"); +include("common.js"); var got_error = false; -var dirname = node.path.dirname(__filename); -var fixtures = node.path.join(dirname, "fixtures"); -var filename = node.path.join(fixtures, "does_not_exist.txt"); +var filename = node.path.join(fixturesDir, "does_not_exist.txt"); var promise = node.fs.cat(filename, "raw"); promise.addCallback(function (content) { @@ -17,5 +15,6 @@ promise.addErrback(function () { }); process.addListener("exit", function () { + puts("done"); assertTrue(got_error); }); diff --git a/test/mjsunit/test-fs-stat.js b/test/mjsunit/test-fs-stat.js index 7867e2d..403a4cc 100644 --- a/test/mjsunit/test-fs-stat.js +++ b/test/mjsunit/test-fs-stat.js @@ -1,4 +1,4 @@ -include("mjsunit.js"); +include("common.js"); var got_error = false; var success_count = 0; diff --git a/test/mjsunit/test-fs-write.js b/test/mjsunit/test-fs-write.js index 38a72de..6c4c2bd 100644 --- a/test/mjsunit/test-fs-write.js +++ b/test/mjsunit/test-fs-write.js @@ -1,8 +1,6 @@ -include("mjsunit.js"); +include("common.js"); -var dirname = node.path.dirname(__filename); -var fixtures = node.path.join(dirname, "fixtures"); -var path = node.path.join(fixtures, "write.txt"); +var path = node.path.join(fixturesDir, "write.txt"); var expected = "hello"; var found; diff --git a/test/mjsunit/test-http-cat.js b/test/mjsunit/test-http-cat.js index 10ce313..c0c0b62 100644 --- a/test/mjsunit/test-http-cat.js +++ b/test/mjsunit/test-http-cat.js @@ -1,4 +1,4 @@ -include("mjsunit.js"); +include("common.js"); PORT = 8888; var body = "exports.A = function() { return 'A';}"; diff --git a/test/mjsunit/test-http-client-race.js b/test/mjsunit/test-http-client-race.js index af83623..5936158 100644 --- a/test/mjsunit/test-http-client-race.js +++ b/test/mjsunit/test-http-client-race.js @@ -1,4 +1,4 @@ -include("mjsunit.js"); +include("common.js"); PORT = 8888; var body1_s = "1111111111111111"; diff --git a/test/mjsunit/test-http-client-upload.js b/test/mjsunit/test-http-client-upload.js index 82bbbfc..bfd716c 100644 --- a/test/mjsunit/test-http-client-upload.js +++ b/test/mjsunit/test-http-client-upload.js @@ -1,4 +1,4 @@ -include("mjsunit.js"); +include("common.js"); var PORT = 18032; var sent_body = ""; diff --git a/test/mjsunit/test-http-malformed-request.js b/test/mjsunit/test-http-malformed-request.js index 7172c4d..68a6ea1 100644 --- a/test/mjsunit/test-http-malformed-request.js +++ b/test/mjsunit/test-http-malformed-request.js @@ -1,4 +1,4 @@ -include("mjsunit.js"); +include("common.js"); // Make sure no exceptions are thrown when receiving malformed HTTP // requests. diff --git a/test/mjsunit/test-http-proxy.js b/test/mjsunit/test-http-proxy.js index 2f64225..f02f21e 100644 --- a/test/mjsunit/test-http-proxy.js +++ b/test/mjsunit/test-http-proxy.js @@ -1,4 +1,4 @@ -include("mjsunit.js"); +include("common.js"); var PROXY_PORT = 8869; var BACKEND_PORT = 8870; diff --git a/test/mjsunit/test-http-server.js b/test/mjsunit/test-http-server.js index 6d0aa28..251f083 100644 --- a/test/mjsunit/test-http-server.js +++ b/test/mjsunit/test-http-server.js @@ -1,4 +1,4 @@ -include("mjsunit.js"); +include("common.js"); var port = 8222; diff --git a/test/mjsunit/test-http.js b/test/mjsunit/test-http.js index 7658459..89f273b 100644 --- a/test/mjsunit/test-http.js +++ b/test/mjsunit/test-http.js @@ -1,4 +1,4 @@ -include("mjsunit.js"); +include("common.js"); PORT = 8888; var responses_sent = 0; diff --git a/test/mjsunit/test-mkdir-rmdir.js b/test/mjsunit/test-mkdir-rmdir.js index 24c1ae1..08c2fa7 100644 --- a/test/mjsunit/test-mkdir-rmdir.js +++ b/test/mjsunit/test-mkdir-rmdir.js @@ -1,4 +1,4 @@ -include("mjsunit.js"); +include("common.js"); var dirname = node.path.dirname(__filename); var fixtures = node.path.join(dirname, "fixtures"); diff --git a/test/mjsunit/test-module-loading.js b/test/mjsunit/test-module-loading.js index 1bb2908..4eb4562 100644 --- a/test/mjsunit/test-module-loading.js +++ b/test/mjsunit/test-module-loading.js @@ -1,5 +1,5 @@ node.debug("load test-module-loading.js"); -include("mjsunit.js"); +include("common.js"); var a = require("fixtures/a.js"); var d = require("fixtures/b/d.js"); var d2 = require("fixtures/b/d.js"); diff --git a/test/mjsunit/test-node-cat.js b/test/mjsunit/test-node-cat.js index 2633b33..384cfe2 100644 --- a/test/mjsunit/test-node-cat.js +++ b/test/mjsunit/test-node-cat.js @@ -1,4 +1,4 @@ -include("mjsunit.js"); +include("common.js"); PORT = 8888; puts("hello world"); diff --git a/test/mjsunit/test-process-buffering.js b/test/mjsunit/test-process-buffering.js index df71148..c55fa51 100644 --- a/test/mjsunit/test-process-buffering.js +++ b/test/mjsunit/test-process-buffering.js @@ -1,4 +1,4 @@ -include("mjsunit.js"); +include("common.js"); var pwd_called = false; diff --git a/test/mjsunit/test-process-kill.js b/test/mjsunit/test-process-kill.js index beac411..8487190 100644 --- a/test/mjsunit/test-process-kill.js +++ b/test/mjsunit/test-process-kill.js @@ -1,4 +1,4 @@ -include("mjsunit.js"); +include("common.js"); var exit_status = -1; diff --git a/test/mjsunit/test-process-simple.js b/test/mjsunit/test-process-simple.js index de7c0c0..76d2ca9 100644 --- a/test/mjsunit/test-process-simple.js +++ b/test/mjsunit/test-process-simple.js @@ -1,4 +1,4 @@ -include("mjsunit.js"); +include("common.js"); var cat = node.createChildProcess("cat"); diff --git a/test/mjsunit/test-process-spawn-loop.js b/test/mjsunit/test-process-spawn-loop.js index 07a7e81..0d92c33 100644 --- a/test/mjsunit/test-process-spawn-loop.js +++ b/test/mjsunit/test-process-spawn-loop.js @@ -1,4 +1,4 @@ -include("mjsunit.js"); +include("common.js"); var N = 40; var finished = false; diff --git a/test/mjsunit/test-promise-wait.js b/test/mjsunit/test-promise-wait.js index d5c242f..5274735 100644 --- a/test/mjsunit/test-promise-wait.js +++ b/test/mjsunit/test-promise-wait.js @@ -1,4 +1,4 @@ -include("mjsunit.js"); +include("common.js"); var p1_done = false; var p1 = new node.Promise(); diff --git a/test/mjsunit/test-readdir.js b/test/mjsunit/test-readdir.js index 04d3382..5981386 100644 --- a/test/mjsunit/test-readdir.js +++ b/test/mjsunit/test-readdir.js @@ -1,13 +1,9 @@ - -include("mjsunit.js"); - -var dirname = node.path.dirname(__filename); -var fixtures = node.path.join(dirname, "fixtures"); +include("common.js"); var got_error = false; -var promise = node.fs.readdir(fixtures); -puts("readdir " + fixtures); +var promise = node.fs.readdir(fixturesDir); +puts("readdir " + fixturesDir); promise.addCallback(function (files) { p(files); diff --git a/test/mjsunit/test-tcp-many-clients.js b/test/mjsunit/test-tcp-many-clients.js index f3905fd..1717ccf 100644 --- a/test/mjsunit/test-tcp-many-clients.js +++ b/test/mjsunit/test-tcp-many-clients.js @@ -1,4 +1,4 @@ -include("mjsunit.js"); +include("common.js"); // settings var port = 20743; var bytes = 1024*40; diff --git a/test/mjsunit/test-tcp-pingpong-delay.js b/test/mjsunit/test-tcp-pingpong-delay.js index bd258fc..af980e4 100644 --- a/test/mjsunit/test-tcp-pingpong-delay.js +++ b/test/mjsunit/test-tcp-pingpong-delay.js @@ -1,4 +1,4 @@ -include("mjsunit.js"); +include("common.js"); var tests_run = 0; diff --git a/test/mjsunit/test-tcp-pingpong.js b/test/mjsunit/test-tcp-pingpong.js index 9aca315..5c7a353 100644 --- a/test/mjsunit/test-tcp-pingpong.js +++ b/test/mjsunit/test-tcp-pingpong.js @@ -1,4 +1,4 @@ -include("mjsunit.js"); +include("common.js"); var tests_run = 0; diff --git a/test/mjsunit/test-tcp-raw.js b/test/mjsunit/test-tcp-raw.js index 202f3a3..53c2ee1 100644 --- a/test/mjsunit/test-tcp-raw.js +++ b/test/mjsunit/test-tcp-raw.js @@ -1,4 +1,4 @@ -include("mjsunit.js"); +include("common.js"); PORT = 23123; var echoServer = node.tcp.createServer(function (connection) { diff --git a/test/mjsunit/test-tcp-raws.js b/test/mjsunit/test-tcp-raws.js index 5d86a1b..a10ee18 100644 --- a/test/mjsunit/test-tcp-raws.js +++ b/test/mjsunit/test-tcp-raws.js @@ -1,4 +1,4 @@ -include("mjsunit.js"); +include("common.js"); PORT = 23123; binaryString = ""; diff --git a/test/mjsunit/test-tcp-reconnect.js b/test/mjsunit/test-tcp-reconnect.js index 8f39763..b805e9d 100644 --- a/test/mjsunit/test-tcp-reconnect.js +++ b/test/mjsunit/test-tcp-reconnect.js @@ -1,4 +1,4 @@ -include("mjsunit.js"); +include("common.js"); var N = 50; var port = 8921; diff --git a/test/mjsunit/test-tcp-throttle-kernel-buffer.js b/test/mjsunit/test-tcp-throttle-kernel-buffer.js index 44e6dd2..eb0523c 100644 --- a/test/mjsunit/test-tcp-throttle-kernel-buffer.js +++ b/test/mjsunit/test-tcp-throttle-kernel-buffer.js @@ -1,4 +1,4 @@ -include("mjsunit.js"); +include("common.js"); PORT = 20444; N = 30*1024; // 500kb diff --git a/test/mjsunit/test-tcp-throttle.js b/test/mjsunit/test-tcp-throttle.js index a064411..05ad0df 100644 --- a/test/mjsunit/test-tcp-throttle.js +++ b/test/mjsunit/test-tcp-throttle.js @@ -1,4 +1,4 @@ -include("mjsunit.js"); +include("common.js"); PORT = 20443; N = 200; diff --git a/test/mjsunit/test-tcp-timeout.js b/test/mjsunit/test-tcp-timeout.js index 59df33a..0f84a70 100644 --- a/test/mjsunit/test-tcp-timeout.js +++ b/test/mjsunit/test-tcp-timeout.js @@ -1,4 +1,4 @@ -include("mjsunit.js"); +include("common.js"); port = 9992; exchanges = 0; starttime = null; diff --git a/test/mjsunit/test-timers.js b/test/mjsunit/test-timers.js index abb3b39..2a81a3a 100644 --- a/test/mjsunit/test-timers.js +++ b/test/mjsunit/test-timers.js @@ -1,4 +1,4 @@ -include("mjsunit.js"); +include("common.js"); var WINDOW = 800; // why is does this need to be so big? diff --git a/test/mjsunit/test-utf8-scripts.js b/test/mjsunit/test-utf8-scripts.js index e50c4a0..c2950d3 100644 --- a/test/mjsunit/test-utf8-scripts.js +++ b/test/mjsunit/test-utf8-scripts.js @@ -1,4 +1,4 @@ -include("mjsunit.js"); +include("common.js"); // üäö diff --git a/test/mjsunit/test-wait-ordering.js b/test/mjsunit/test-wait-ordering.js index 8f5a5fd..cc05222 100644 --- a/test/mjsunit/test-wait-ordering.js +++ b/test/mjsunit/test-wait-ordering.js @@ -1,4 +1,4 @@ -include("mjsunit.js"); +include("common.js"); function timer (t) { var promise = new node.Promise(); diff --git a/wscript b/wscript index d13fc89..902bed1 100644 --- a/wscript +++ b/wscript @@ -326,3 +326,4 @@ def build(bld): """); bld.install_files('${PREFIX}/share/man/man1/', 'doc/node.1'); bld.install_files('${PREFIX}/bin/', 'node-repl', chmod=0755); + bld.install_files('${PREFIX}/lib/node_libraries/', 'lib/*.js'); -- 2.7.4