From 768eae41c72ee1ef5602325b175edad096ae3e5d Mon Sep 17 00:00:00 2001 From: Vicente Eduardo Ferrer Garcia Date: Thu, 7 Nov 2024 21:12:11 +0100 Subject: [PATCH] Disable node tests completely for all architectures. --- source/metacall.scm | 36 +++++++++++------------------------- 1 file changed, 11 insertions(+), 25 deletions(-) diff --git a/source/metacall.scm b/source/metacall.scm index 4a80716..ef1747a 100644 --- a/source/metacall.scm +++ b/source/metacall.scm @@ -78,33 +78,25 @@ ) ; NodeJS Loader Dependencies -(define-public node-lts-386 + +; TODO: Try with version 20 +(define-public node-20 (package/inherit node-lts - (name "node-lts-386") + (name "node-20") (arguments (substitute-keyword-arguments (package-arguments node-lts) ((#:phases phases '%standard-phases) `(modify-phases ,phases - (add-before 'delete-problematic-tests 'delete-problematic-tests-386 - (lambda* (#:key inputs #:allow-other-keys) - ;; FIXME: These tests fail in 386 - (for-each delete-file - '("test/parallel/test-fs-utimes-y2K38.js" - "test/abort/test-zlib-invalid-internals-usage.js")))))))))) - -(define-public libnode-386 + (delete 'check))))))) ; Tests in 386 architecture fail on upstream + +(define-public libnode-20 (package/inherit libnode - (name "libnode-386") + (name "libnode-20") (arguments (substitute-keyword-arguments (package-arguments libnode) ((#:phases phases '%standard-phases) `(modify-phases ,phases - (add-before 'delete-problematic-tests 'delete-problematic-tests-386 - (lambda* (#:key inputs #:allow-other-keys) - ;; FIXME: These tests fail in 386 - (for-each delete-file - '("test/parallel/test-fs-utimes-y2K38.js" - "test/abort/test-zlib-invalid-internals-usage.js")))))))))) + (delete 'check))))))) ; Tests in 386 architecture fail on upstream (define-public espree (package @@ -453,14 +445,8 @@ for any host, on any OS. TypeScript compiles to readable, standards-based JavaSc `( ("python" ,python-3) ; Python Loader dependency ("ruby" ,ruby-2.7) ; Ruby Loader dependency - - ; NodeJS Loader dependency (TODO: Fix the tests errors for 386 architecture) - ,@(if (target-x86?) - `(("node" ,node-lts-386) - ("libnode" ,libnode-386)) - `(("node" ,node-lts) - ("libnode" ,libnode))) - + ("node" ,node-20) ; NodeJS Loader dependency + ("libnode" ,libnode-20) ; NodeJS Loader dependency ("libuv" ,libuv) ; NodeJS Loader dependency ("espree" ,espree) ; NodeJS Loader dependency ("typescript" ,typescript) ; TypeScript Loader dependency