Fix merge + add type_traits to simdjson

v8 · Oct 2, 2024 · b85f798 · b85f798
1 parent a4ddc35
commit b85f798
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/deps/simdjson/simdjson.cpp b/deps/simdjson/simdjson.cpp
@@ -89,6 +89,7 @@
 #include <cstdlib>
 #include <cfloat>
 #include <cassert>
+#include <type_traits>
 #ifndef _WIN32
 // strcasecmp, strncasecmp
 #include <strings.h>

diff --git a/test/parallel/parallel.status b/test/parallel/parallel.status
@@ -40,7 +40,6 @@ test-repl: SKIP
 # Temporarily disabled to land https://crrev.com/c/4507375
 test-fs-write: SKIP
 
-<<<<<<< HEAD
 # https:/nodejs/node/issues/51862
 test-fs-read-stream-concurrent-reads: PASS, FLAKY
 # Temporarily skip for https://crrev.com/c/2960211
@@ -51,13 +50,11 @@ test-npm-install: SKIP
 test-trace-events-all: SKIP
 test-trace-events-v8: SKIP
 # Skip test depending on always-true removed --harmony-atomics flag
-=======
 # Skip failed tests related to iterator helpers 
 # https://bugs.chromium.org/p/v8/issues/detail?id=13558
 test-repl-tab-complete: SKIP
 test-shadow-realm-globals: SKIP
 
->>>>>>> ff1bdd5b82 (Skip the failing tests (#159))
 # Skip tests depending on removed feature flags for SAB and Atomics
 test-worker-no-atomics: SKIP
 test-worker-no-sab: SKIP

diff --git a/test/wasm-allocation/wasm-allocation.status b/test/wasm-allocation/wasm-allocation.status
@@ -6,5 +6,8 @@ prefix wasm-allocation
 
 [true] # This section applies to all platforms
 
+# Failing on NodeCI.
+test-wasm-allocation: SKIP
+
 [$system!=linux || $asan==on]
 test-wasm-allocation: SKIP