Tests: fixed "fs" tests with custom build directory.

diff --git a/test/fs/methods.t.js b/test/fs/methods.t.js
index 849e77c2011f1d3c401fb580c70c16e09281a99a..bf57f1f6924cf00a5469a9dbad89b69fa659e6b5 100644 (file)
--- a/test/fs/methods.t.js
+++ b/test/fs/methods.t.js
@@ -9,7 +9,7 @@ function p(args, default_opts) {
     let fname = params.args[0];
 
     if (fname[0] == '@') {
-        let gen = `build/test/fs_test_${Math.round(Math.random() * 1000000)}`;
+        let gen = `${test_dir}/fs_test_${Math.round(Math.random() * 1000000)}`;
         params.args = params.args.map(v => v);
         params.args[0] = gen + fname.slice(1);
     }
@@ -368,9 +368,9 @@ async function realpath_test(params) {
 }
 
 let realpath_tests = () => [
-    { args: ["build/test/.."],
-      check: (data) => data.endsWith("build") },
-    { args: ["build/test/", {encoding:'buffer'}],
+    { args: ["test/fs/.."],
+      check: (data) => data.endsWith("test") },
+    { args: ["test/fs/ascii", {encoding:'buffer'}],
       check: (data) => data instanceof Buffer },
 ];
 
@@ -478,14 +478,14 @@ let stat_tests = () => [
           return true;
       } },
 
-    { args: ["build/"],
+    { args: ["test/fs/ascii"],
       check: (st) => contains(Object.keys(st),
                               [ "atime", "atimeMs", "birthtime", "birthtimeMs",
                                 "blksize", "blocks", "ctime", "ctimeMs", "dev",
                                 "gid", "ino", "mode", "mtime", "mtimeMs","nlink",
                                 "rdev", "size", "uid" ]) },
 
-    { args: ["build/"],
+    { args: ["test/fs/ascii"],
       check: (st) => Object.keys(st).every(p => {
         let v = st[p];
         if (p == 'atime' || p == 'ctime' || p == 'mtime' || p == 'birthtime') {
@@ -503,7 +503,7 @@ let stat_tests = () => [
         return true;
       }) },
 
-    { args: ["build/"],
+    { args: ["test/fs/ascii"],
       check: (st) => ['atime', 'birthtime', 'ctime', 'mtime'].every(p => {
           let date = st[p].valueOf();
           let num = st[p + 'Ms'];
@@ -515,7 +515,7 @@ let stat_tests = () => [
           return true;
       }) },
 
-    { args: ["build/"],
+    { args: [test_dir],
       check: (st) => ['isBlockDevice',
                       'isCharacterDevice',
                       'isDirectory',

diff --git a/test/fs/promises_01.t.js b/test/fs/promises_01.t.js
index 22193153a7eea90bcf5b4456c13f9abb273b6ea6..bcea784e8c5cc120e5beede6eb598876ffed1457 100644 (file)
--- a/test/fs/promises_01.t.js
+++ b/test/fs/promises_01.t.js
@@ -3,7 +3,7 @@ includes: [compareArray.js, compatFs.js]
 flags: [async]
 ---*/
 
-var fname = 'build/test/fs_promises_01';
+var fname = `${test_dir}/fs_promises_01`;
 
 let stages = [];
 

diff --git a/test/fs/promises_02.t.js b/test/fs/promises_02.t.js
index a07f74125fd8962833165a4da3c7c758633ab108..cbe799910d3c9021aebf527e43603d11b849a088 100644 (file)
--- a/test/fs/promises_02.t.js
+++ b/test/fs/promises_02.t.js
@@ -3,7 +3,7 @@ includes: [compareArray.js, compatFs.js]
 flags: [async]
 ---*/
 
-var fname = 'build/test/fs_promises_02';
+var fname = `${test_dir}/fs_promises_02`;
 
 var testSync = new Promise((resolve, reject) => {
     var failed = false;

diff --git a/test/fs/promises_03.t.js b/test/fs/promises_03.t.js
index 1c7d94c84aa616df6826ddf4c07118f9512ef4d9..41cc7f67639e3f97d69afe241780a118c2f5917d 100644 (file)
--- a/test/fs/promises_03.t.js
+++ b/test/fs/promises_03.t.js
@@ -3,7 +3,7 @@ includes: [compareArray.js, compatFs.js]
 flags: [async]
 ---*/
 
-var fname = 'build/test/fs_promises_03';
+var fname = `${test_dir}/fs_promises_03`;
 
 var testSync = () => new Promise((resolve, reject) => {
     try {

diff --git a/test/fs/promises_04.t.js b/test/fs/promises_04.t.js
index d6e61ae2411d518e937f32b625810e33638bce90..ce358a45cde0ffd0aa294e4f7c034253f06475ed 100644 (file)
--- a/test/fs/promises_04.t.js
+++ b/test/fs/promises_04.t.js
@@ -3,10 +3,9 @@ includes: [compareArray.js, compatFs.js]
 flags: [async]
 ---*/
 
-var dname = 'build/test/';
-var fname = dname + 'fs_promises_04';
-var fname_utf8 = dname + 'fs_promises_αβγ_04';
-var lname = dname + 'fs_promises_04_lnk';
+var fname = `${test_dir}/fs_promises_04`;
+var fname_utf8 = `${test_dir}/fs_promises_αβγ_04`;
+var lname = `${test_dir}/fs_promises_lnk_04`;
 
 var testSync = () => new Promise((resolve, reject) => {
     try {

diff --git a/test/fs/promises_05.t.js b/test/fs/promises_05.t.js
index f957d776fa76048d65052829ae3a622e687041a1..bfc360599e7bb84c862f7c54be451377f3fcc84d 100644 (file)
--- a/test/fs/promises_05.t.js
+++ b/test/fs/promises_05.t.js
@@ -3,9 +3,8 @@ includes: [compareArray.js, compatFs.js]
 flags: [async]
 ---*/
 
-var rname = 'build/test/';
-var dname = rname + 'fs_promises_05';
-var dname_utf8 = rname + 'fs_promises_αβγ_05';
+var dname = `${test_dir}/fs_promises_05`;
+var dname_utf8 = `${test_dir}/fs_promises_αβγ_05`;
 var fname = (d) => d + '/fs_promises_05_file';
 
 var testSync = () => new Promise((resolve, reject) => {

diff --git a/test/fs/promises_06.t.js b/test/fs/promises_06.t.js
index 9a5186c2aee59f840dab9cd4a974583f50de97af..ed896f98e8b24843bfd1ad7c4a4934b784f17136 100644 (file)
--- a/test/fs/promises_06.t.js
+++ b/test/fs/promises_06.t.js
@@ -3,7 +3,7 @@ includes: [compareArray.js, compatFs.js]
 flags: [async]
 ---*/
 
-var dname = 'build/test/';
+var dname = `${test_dir}/`;
 var fname = (d) => d + '/fs_promises_06_file';
 var fname_utf8 = (d) => d + '/fs_promises_αβγ_06';
 
@@ -73,6 +73,9 @@ Promise.resolve()
 .then(() => {
     stages.push("renameSync");
 })
+.catch((e) => {
+    console.log('test fs.renameSync failed', JSON.stringify(e));
+})
 
 .then(testCallback)
 .then(() => {

diff --git a/test/fs/promises_07.t.js b/test/fs/promises_07.t.js
index e4fcb42ca188755cdb8ad52a5b466309d4b0ec29..c0d0dd997a3f4f984977470b3a936ae232c879c2 100644 (file)
--- a/test/fs/promises_07.t.js
+++ b/test/fs/promises_07.t.js
@@ -3,8 +3,8 @@ includes: [compareArray.js, compatFs.js]
 flags: [async]
 ---*/
 
-var dname = 'build/test/fs_promises_07';
-var dname_utf8 = 'build/test/fs_promises_αβγ_07';
+var dname = `${test_dir}/fs_promises_07`;
+var dname_utf8 = `${test_dir}/fs_promises_αβγ_07`;
 var fname = (d) => d + '/fs_promises_07_file';
 var lname = (d) => d + '/fs_promises_07_link';
 var cname = (d) => d + '/fs_promises_αβγ_07_dir';

diff --git a/test/fs/promises_08.t.js b/test/fs/promises_08.t.js
index f0b393b7279641d0e125c8a6f8939e1088c1fe36..7aba5b22f0c7a55fcb8b444ae9fc336c8b2a027b 100644 (file)
--- a/test/fs/promises_08.t.js
+++ b/test/fs/promises_08.t.js
@@ -3,7 +3,7 @@ includes: [compareArray.js, compatFs.js]
 flags: [async]
 ---*/
 
-var dname = 'build/test/fs_promises_αβγ_08/';
+var dname = `${test_dir}/fs_promises_αβγ_08/`;
 var path = 'one/two/three/αβγ';
 
 var wipePath = (root, path, nofail) => {

diff --git a/test/fs/promises_09.t.js b/test/fs/promises_09.t.js
index 7ca0b8c5d8afdadbb9bccd7114046cdd61556672..6ae864771328e3c60e3666dee962e0db0198c0b3 100644 (file)
--- a/test/fs/promises_09.t.js
+++ b/test/fs/promises_09.t.js
@@ -3,7 +3,7 @@ includes: [compareArray.js, compatFs.js]
 flags: [async]
 ---*/
 
-var root = 'build/test/';
+var root = test_dir;
 var dname = 'fs_promises_αβγ_09/';
 var lname = 'fs_promises_αβγ_09_lnk';
 var path = 'one/two/three/αβγ';

diff --git a/test/harness/compatFs.js b/test/harness/compatFs.js
index e4732c96a4698820cda8fb2f24d3cfe67a076645..9bb8c491c73d48d2557be223347bbb74083b163b 100644 (file)
--- a/test/harness/compatFs.js
+++ b/test/harness/compatFs.js
@@ -9,3 +9,6 @@ if (typeof require == 'function') {
 function has_fs() {
     return fs;
 }
+
+let test_dir = process.env && process.env['NJS_TEST_DIR'] || 'build';
+test_dir = `${test_dir}/test`;

diff --git a/test/help b/test/help
index f142edf5f6b0d787c8f7927a501e3be6add5a297..465d6c2593dabeff13b26144a9d52531dfbd1eff 100644 (file)
--- a/test/help
+++ b/test/help
@@ -17,6 +17,4 @@ default: "$NJS_TEST_LOG"
 default: "$NJS_TEST_DIR"
   --verbose=YES             enables verbose output, \
 default: "$NJS_TEST_VERBOSE"
-  --leave=YES               disables removing of "$NJS_TEST_DIR", \
-default: "$NJS_TEST_LEAVE"
 END

diff --git a/test/test262 b/test/test262
index 14c65b2fd377134402cc92650b02bde094c663e4..ae4ce6e7a17f12fdb4c6c60e2a6556f83df8d4e2 100755 (executable)
--- a/test/test262
+++ b/test/test262
@@ -19,7 +19,7 @@ for njs_test in $NJS_TESTS; do
 running $njs_test $njs_log
 END
 
-    if /bin/sh -c "($NJS_TEST_BINARY $NJS_TEST_DIR/$njs_test)" > $njs_log 2>&1; then
+    if /bin/sh -c "(NJS_TEST_DIR=$NJS_TEST_DIR $NJS_TEST_BINARY $NJS_TEST_DIR/$njs_test)" > $njs_log 2>&1; then
         njs_success=yes
     else
         njs_success=no