Skip to content

Commit 0d04c50

Browse files
committed
Fix build + skip new flaky tests
1 parent 12881fc commit 0d04c50

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

deps/simdjson/simdjson.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3651,9 +3651,9 @@ inline std::ostream& operator<<(std::ostream& out, simdjson_result<padded_string
36513651
} // namespace simdjson
36523652

36533653
// This is deliberately outside of simdjson so that people get it without having to use the namespace
3654-
inline simdjson::padded_string operator "" _padded(const char *str, size_t len);
3654+
inline simdjson::padded_string operator ""_padded(const char *str, size_t len);
36553655
#ifdef __cpp_char8_t
3656-
inline simdjson::padded_string operator "" _padded(const char8_t *str, size_t len);
3656+
inline simdjson::padded_string operator ""_padded(const char8_t *str, size_t len);
36573657
#endif
36583658

36593659
namespace simdjson {
@@ -4033,11 +4033,11 @@ inline simdjson_result<padded_string> padded_string::load(std::string_view filen
40334033

40344034
} // namespace simdjson
40354035

4036-
inline simdjson::padded_string operator "" _padded(const char *str, size_t len) {
4036+
inline simdjson::padded_string operator ""_padded(const char *str, size_t len) {
40374037
return simdjson::padded_string(str, len);
40384038
}
40394039
#ifdef __cpp_char8_t
4040-
inline simdjson::padded_string operator "" _padded(const char8_t *str, size_t len) {
4040+
inline simdjson::padded_string operator ""_padded(const char8_t *str, size_t len) {
40414041
return simdjson::padded_string(reinterpret_cast<const char8_t *>(str), len);
40424042
}
40434043
#endif

deps/sqlite/unofficial.gni

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
template("sqlite_gn_build") {
88
config("sqlite_config") {
99
include_dirs = [ "." ]
10+
defines = [
11+
"SQLITE_ENABLE_SESSION",
12+
"SQLITE_ENABLE_PREUPDATE_HOOK",
13+
]
1014
}
1115

1216
gypi_values = exec_script("../../tools/gypi_to_gn.py",
@@ -31,13 +35,6 @@ template("sqlite_gn_build") {
3135
"-Wno-unused-function",
3236
"-Wno-unused-variable",
3337
]
34-
} else {
35-
cflags_c = [
36-
"-Wno-implicit-fallthrough",
37-
"-Wno-unreachable-code",
38-
"-Wno-unreachable-code-break",
39-
"-Wno-unreachable-code-return",
40-
]
4138
}
4239
}
4340
}

test/parallel/parallel.status

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ test-repl-mode: SKIP
3939
test-repl: SKIP
4040
# Temporarily disabled to land https://crrev.com/c/4507375
4141
test-fs-write: SKIP
42+
# Skip new flaky tests:
43+
test-without-async-context-frame: SKIP
44+
test-repl-preview-timeout: SKIP
4245

4346
# https://github.com/nodejs/node/issues/51862
4447
test-fs-read-stream-concurrent-reads: PASS, FLAKY

unofficial.gni

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ template("node_gn_build") {
277277
ldflags = [ "/OPT:NOICF" ] # link.exe, but also lld-link.exe.
278278
} else if (is_apple && !use_lld) {
279279
ldflags = [ "-Wl,-no_deduplicate" ] # ld64.
280-
} else if (use_gold || use_lld) {
280+
} else if (use_lld) {
281281
ldflags = [ "-Wl,--icf=none" ]
282282
}
283283
}

0 commit comments

Comments
 (0)