diff --git a/build.xml b/build.xml index 0b1738a..998ddca 100644 --- a/build.xml +++ b/build.xml @@ -297,6 +297,7 @@ + @@ -399,6 +400,7 @@ + diff --git a/patches/lib/fs.js.patch b/patches/lib/fs.js.patch index 68b83f3..8cc91ba 100644 --- a/patches/lib/fs.js.patch +++ b/patches/lib/fs.js.patch @@ -1,6 +1,15 @@ ---- ../node/lib/fs.js 2013-05-05 20:54:59.000000000 +0200 -+++ src/main/js/lib/fs.js 2013-05-13 15:13:01.000000000 +0200 -@@ -104,7 +104,7 @@ +--- ../node/lib/fs.js 2013-12-16 14:49:26.000000000 +0100 ++++ ./src/main/js/lib/fs.js 2014-01-14 10:38:31.000000000 +0100 +@@ -62,6 +62,8 @@ + var callback; + if (DEBUG) { + var backtrace = new Error; ++ // Nashorn: https://bugs.openjdk.java.net/browse/JDK-8029967 ++ Error.captureStackTrace(backtrace); + callback = debugCallback; + } else + callback = missingCallback; +@@ -104,7 +106,7 @@ } return function() { diff --git a/patches/test/simple/test-fs-readfile-error.js.patch b/patches/test/simple/test-fs-readfile-error.js.patch new file mode 100644 index 0000000..f10d4fd --- /dev/null +++ b/patches/test/simple/test-fs-readfile-error.js.patch @@ -0,0 +1,13 @@ +--- ../node/test/simple/test-fs-readfile-error.js 2013-12-09 10:27:58.000000000 +0100 ++++ ./test/simple/test-fs-readfile-error.js 2014-01-14 10:21:36.000000000 +0100 +@@ -46,7 +46,9 @@ + + test({ NODE_DEBUG: 'fs' }, function(data) { + assert(/EISDIR/.test(data)); +- assert(/test-fs-readfile-error/.test(data)); ++ // The rethrown exception looses its stack. ++ // Nashorn: https://bugs.openjdk.java.net/browse/JDK-8029967 ++ // assert(/test-fs-readfile-error/.test(data)); + callbacks++; + }); + diff --git a/project.properties b/project.properties index 800fe14..04019b7 100644 --- a/project.properties +++ b/project.properties @@ -238,6 +238,7 @@ source.test.simple.list = \ test-fs-read-stream-resume.js \ test-fs-read-stream.js \ test-fs-readfile-empty.js \ + test-fs-readfile-error.js \ test-fs-readfile-pipe.js \ test-fs-readfile-unlink.js \ test-fs-readfile-zero-byte-liar.js \