fixup Add node-12

Change-Id: I4f7b4619387a6ddfc830dfc641d560ce4b373459

1 files changed, 35 insertions, 1 deletions

diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index d960ac2f67..9c0440d0c1 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -451,6 +451,11 @@ devices.")
                             "test/parallel/test-child-process-exec-env.js")
                (("'/usr/bin/env'")
                 (string-append "'" (search-input-file inputs "/bin/env") "'")))))
+         (add-after 'unpack 'extend-default-test-timeout
+           (lambda _
+             ;; The default is 120ms, with a multiplier for some architectures.
+             (substitute* "tools/test.py"
+               (("default=120") "default=480"))))
          (add-after 'patch-hardcoded-program-references 'delete-problematic-tests
            (lambda* (#:key inputs #:allow-other-keys)
 
@@ -510,16 +515,43 @@ devices.")
                  "test/parallel/test-http2-client-request-listeners-warning.js"
                  "test/parallel/test-http2-methods.js"
                  "test/parallel/test-http2-multiplex.js"
+                 "test/parallel/test-http2-reset-flood.js"
                  "test/parallel/test-http2-server-set-header.js"
                  "test/parallel/test-https-simple.js"
                  "test/parallel/test-https-strict.js"
-                 "test/parallel/test-intl.js"
                  "test/parallel/test-release-npm.js"))
 
+             ;; AssertionError [ERR_ASSERTION]: Expected values to be strictly equal:
+             (delete-file "test/parallel/test-intl.js")
+
              ;; Some architecture dependant test failures:
              (cond
                (,(target-ppc64le?)
                 (delete-file "test/parallel/test-worker-nearheaplimit-deadlock.js"))
+               #;
+               (,(target-aarch64?)
+                ;; These tests timeout
+                (for-each
+                  delete-file
+                  '(
+                    "test/parallel/test-async-hooks-worker-asyncfn-terminate-1.js"
+                    "test/parallel/test-async-hooks-worker-asyncfn-terminate-2.js"
+                    "test/parallel/test-async-hooks-worker-asyncfn-terminate-3.js"
+                    "test/parallel/test-async-hooks-worker-asyncfn-terminate-4.js"
+                    "test/parallel/test-cli-node-options.js"
+                    "test/parallel/test-crypto-key-objects-messageport.js"
+                    "test/parallel/test-crypto-worker-thread.js"
+                    "test/parallel/test-disable-proto-delete.js"
+                    "test/parallel/test-disable-proto-throw.js"
+                    "test/parallel/test-performance-eventlooputil.js"
+                    "test/parallel/test-preload.js"
+                    "test/parallel/test-process-exec-argv.js"
+                    "test/parallel/test-require-symlink.js"
+                    "test/parallel/test-trace-events-api-worker-disabled.js"
+                    "test/parallel/test-trace-events-async-hooks-worker.js"
+                    "test/parallel/test-trace-events-worker-metadata.js"
+                    "test/parallel/test-trace-exit.js"
+                    )))
                (else #t))
 
              ;; These tests have an expiry date: they depend on the validity of
@@ -581,6 +613,8 @@ devices.")
                                          "x64")
                                         ((? (cut string-prefix? "powerpc64" <>))
                                          "ppc64")
+                                        ((? (cut string-prefix? "powerpc" <>))
+                                         "ppc")
                                         ((? (cut string-prefix? "riscv64" <>))
                                          "riscv64")
                                         (_ "unsupported"))))