Skip to content

Commit 3f5ac86

Browse files
Merge branch 'nodejs:main' into fix/coverage-ignore-brda-61586
2 parents 77cd1d5 + 4579957 commit 3f5ac86

File tree

248 files changed

+8780
-2729
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

248 files changed

+8780
-2729
lines changed

.github/workflows/notify-on-push.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,16 @@ jobs:
3030

3131
validateCommitMessage:
3232
name: Notify on Push on `main` with invalid message
33-
if: github.repository == 'nodejs/node'
3433
# cannot use ubuntu-slim here because rtCamp/action-slack-notify is dockerized
3534
runs-on: ubuntu-24.04-arm
3635
steps:
37-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
38-
with:
39-
persist-credentials: false
40-
- name: Check commit message
36+
- name: Validate commits
37+
run: echo "$COMMITS" | npx -q core-validate-commit -
4138
id: commit-check
42-
run: npx -q core-validate-commit "$COMMIT"
4339
env:
44-
COMMIT: ${{ github.event.after }}
40+
COMMITS: ${{ toJSON(github.event.commits) }}
4541
- name: Slack Notification
46-
if: ${{ failure() && steps.commit-check.conclusion == 'failure' }}
42+
if: ${{ failure() && steps.commit-check.conclusion == 'failure' && github.repository == 'nodejs/node' }}
4743
uses: rtCamp/action-slack-notify@e31e87e03dd19038e411e38ae27cbad084a90661 # 2.3.3
4844
env:
4945
SLACK_COLOR: '#DE512A'

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ release.
4141
</tr>
4242
<tr>
4343
<td valign="top">
44-
<b><a href="doc/changelogs/CHANGELOG_V25.md#25.8.0">25.8.0</a></b><br/>
44+
<b><a href="doc/changelogs/CHANGELOG_V25.md#25.8.1">25.8.1</a></b><br/>
45+
<a href="doc/changelogs/CHANGELOG_V25.md#25.8.0">25.8.0</a><br/>
4546
<a href="doc/changelogs/CHANGELOG_V25.md#25.7.0">25.7.0</a><br/>
4647
<a href="doc/changelogs/CHANGELOG_V25.md#25.6.1">25.6.1</a><br/>
4748
<a href="doc/changelogs/CHANGELOG_V25.md#25.6.0">25.6.0</a><br/>

Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -838,6 +838,10 @@ out/doc/api: doc/api
838838
# Using grouped targets (&:) so Make knows one command produces all outputs
839839
ifeq ($(OSTYPE),aix)
840840
# TODO(@nodejs/web-infra): AIX is currently hanging during HTML minification
841+
$(apidocs_html) $(apidocs_json) out/doc/api/all.html out/doc/api/all.json:
842+
@echo "Skipping $@ (not currently supported by $(OSTYPE) machines)"
843+
else ifeq ($(OSTYPE),os400)
844+
# TODO(@nodejs/web-infra): IBMi is currently hanging during HTML minification
841845
$(apidocs_html) $(apidocs_json) out/doc/api/all.html out/doc/api/all.json:
842846
@echo "Skipping $@ (not currently supported by $(OSTYPE) machines)"
843847
else

deps/ada/ada.gyp

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,19 @@
66
{
77
'target_name': 'ada',
88
'type': 'static_library',
9-
'include_dirs': ['.'],
9+
'include_dirs': [
10+
'.',
11+
'<(DEPTH)/deps/v8/third_party/simdutf',
12+
],
1013
'direct_dependent_settings': {
1114
'include_dirs': ['.'],
1215
},
16+
'defines': [
17+
'ADA_USE_SIMDUTF=1',
18+
],
19+
'dependencies': [
20+
'../../tools/v8_gypfiles/v8.gyp:simdutf',
21+
],
1322
'sources': [ '<@(ada_sources)' ]
1423
},
1524
]

deps/googletest/include/gtest/gtest-test-part.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
#include <iosfwd>
3838
#include <ostream>
3939
#include <string>
40+
#include <string_view>
4041
#include <vector>
4142

4243
#include "gtest/internal/gtest-internal.h"
@@ -65,10 +66,10 @@ class GTEST_API_ [[nodiscard]] TestPartResult {
6566
// C'tor. TestPartResult does NOT have a default constructor.
6667
// Always use this constructor (with parameters) to create a
6768
// TestPartResult object.
68-
TestPartResult(Type a_type, const char* a_file_name, int a_line_number,
69-
const char* a_message)
69+
TestPartResult(Type a_type, std::string_view a_file_name, int a_line_number,
70+
std::string_view a_message)
7071
: type_(a_type),
71-
file_name_(a_file_name == nullptr ? "" : a_file_name),
72+
file_name_(a_file_name),
7273
line_number_(a_line_number),
7374
summary_(ExtractSummary(a_message)),
7475
message_(a_message) {}
@@ -112,7 +113,7 @@ class GTEST_API_ [[nodiscard]] TestPartResult {
112113

113114
// Gets the summary of the failure message by omitting the stack
114115
// trace in it.
115-
static std::string ExtractSummary(const char* message);
116+
static std::string ExtractSummary(std::string_view message);
116117

117118
// The name of the source file where the test part took place, or
118119
// "" if the source file is unknown.

deps/googletest/include/gtest/gtest.h

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
#include <set>
5858
#include <sstream>
5959
#include <string>
60+
#include <string_view>
6061
#include <type_traits>
6162
#include <vector>
6263

@@ -1246,7 +1247,7 @@ class GTEST_API_ [[nodiscard]] UnitTest {
12461247
// eventually call this to report their results. The user code
12471248
// should use the assertion macros instead of calling this directly.
12481249
void AddTestPartResult(TestPartResult::Type result_type,
1249-
const char* file_name, int line_number,
1250+
std::string_view file_name, int line_number,
12501251
const std::string& message,
12511252
const std::string& os_stack_trace)
12521253
GTEST_LOCK_EXCLUDED_(mutex_);
@@ -1619,6 +1620,8 @@ class GTEST_API_ [[nodiscard]] AssertHelper {
16191620
// Constructor.
16201621
AssertHelper(TestPartResult::Type type, const char* file, int line,
16211622
const char* message);
1623+
AssertHelper(TestPartResult::Type type, std::string_view file, int line,
1624+
std::string_view message);
16221625
~AssertHelper();
16231626

16241627
// Message assignment is a semantic trick to enable assertion
@@ -1632,12 +1635,12 @@ class GTEST_API_ [[nodiscard]] AssertHelper {
16321635
// re-using stack space even for temporary variables, so every EXPECT_EQ
16331636
// reserves stack space for another AssertHelper.
16341637
struct AssertHelperData {
1635-
AssertHelperData(TestPartResult::Type t, const char* srcfile, int line_num,
1636-
const char* msg)
1638+
AssertHelperData(TestPartResult::Type t, std::string_view srcfile,
1639+
int line_num, std::string_view msg)
16371640
: type(t), file(srcfile), line(line_num), message(msg) {}
16381641

16391642
TestPartResult::Type const type;
1640-
const char* const file;
1643+
const std::string_view file;
16411644
int const line;
16421645
std::string const message;
16431646

deps/googletest/include/gtest/internal/gtest-internal.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1452,8 +1452,7 @@ class [[nodiscard]] NeverThrown {
14521452
; \
14531453
else \
14541454
fail(::testing::internal::GetBoolAssertionFailureMessage( \
1455-
gtest_ar_, text, #actual, #expected) \
1456-
.c_str())
1455+
gtest_ar_, text, #actual, #expected))
14571456

14581457
#define GTEST_TEST_NO_FATAL_FAILURE_(statement, fail) \
14591458
GTEST_AMBIGUOUS_ELSE_BLOCKER_ \

deps/googletest/src/gtest-test-part.cc

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,19 @@
3434

3535
#include <ostream>
3636
#include <string>
37+
#include <string_view>
3738

39+
#include "gtest/internal/gtest-internal.h"
3840
#include "gtest/internal/gtest-port.h"
3941
#include "src/gtest-internal-inl.h"
4042

4143
namespace testing {
4244

4345
// Gets the summary of the failure message by omitting the stack trace
4446
// in it.
45-
std::string TestPartResult::ExtractSummary(const char* message) {
46-
const char* const stack_trace = strstr(message, internal::kStackTraceMarker);
47-
return stack_trace == nullptr ? message : std::string(message, stack_trace);
47+
std::string TestPartResult::ExtractSummary(const std::string_view message) {
48+
auto stack_trace = message.find(internal::kStackTraceMarker);
49+
return std::string(message.substr(0, stack_trace));
4850
}
4951

5052
// Prints a TestPartResult object.

deps/googletest/src/gtest.cc

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
#include <ostream> // NOLINT
5959
#include <set>
6060
#include <sstream>
61+
#include <string_view>
6162
#include <unordered_set>
6263
#include <utility>
6364
#include <vector>
@@ -485,6 +486,15 @@ bool ShouldEmitStackTraceForResultType(TestPartResult::Type type) {
485486
// AssertHelper constructor.
486487
AssertHelper::AssertHelper(TestPartResult::Type type, const char* file,
487488
int line, const char* message)
489+
: AssertHelper(
490+
type, file == nullptr ? std::string_view() : std::string_view(file),
491+
line,
492+
message == nullptr ? std::string_view() : std::string_view(message)) {
493+
}
494+
495+
AssertHelper::AssertHelper(TestPartResult::Type type,
496+
const std::string_view file, int line,
497+
const std::string_view message)
488498
: data_(new AssertHelperData(type, file, line, message)) {}
489499

490500
AssertHelper::~AssertHelper() { delete data_; }
@@ -875,7 +885,11 @@ class PositiveAndNegativeUnitTestFilter {
875885
// and does not match the negative filter.
876886
bool MatchesTest(const std::string& test_suite_name,
877887
const std::string& test_name) const {
888+
#ifdef GTEST_HAS_ABSL
889+
return MatchesName(absl::StrCat(test_suite_name, ".", test_name));
890+
#else
878891
return MatchesName(test_suite_name + "." + test_name);
892+
#endif
879893
}
880894

881895
// Returns true if and only if name matches the positive filter and does not
@@ -2547,8 +2561,9 @@ void ReportFailureInUnknownLocation(TestPartResult::Type result_type,
25472561
// AddTestPartResult.
25482562
UnitTest::GetInstance()->AddTestPartResult(
25492563
result_type,
2550-
nullptr, // No info about the source file where the exception occurred.
2551-
-1, // We have no info on which line caused the exception.
2564+
std::string_view(), // No info about the source file where the exception
2565+
// occurred.
2566+
-1, // We have no info on which line caused the exception.
25522567
message,
25532568
""); // No stack trace, either.
25542569
}
@@ -5428,8 +5443,8 @@ Environment* UnitTest::AddEnvironment(Environment* env) {
54285443
// this to report their results. The user code should use the
54295444
// assertion macros instead of calling this directly.
54305445
void UnitTest::AddTestPartResult(TestPartResult::Type result_type,
5431-
const char* file_name, int line_number,
5432-
const std::string& message,
5446+
const std::string_view file_name,
5447+
int line_number, const std::string& message,
54335448
const std::string& os_stack_trace)
54345449
GTEST_LOCK_EXCLUDED_(mutex_) {
54355450
Message msg;
301 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)