Skip to content

Commit a1fc7c7

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents 0bfe6d3 + ce616ea commit a1fc7c7

File tree

4 files changed

+6
-2
lines changed

4 files changed

+6
-2
lines changed

CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -252,8 +252,8 @@ if (AERON_TESTS)
252252

253253
FetchContent_Declare(
254254
gmock
255-
URL ${CMAKE_CURRENT_SOURCE_DIR}/cppbuild/googletest-release-1.12.1.zip
256-
URL_MD5 2648d4138129812611cf6b6b4b497a3b)
255+
URL ${CMAKE_CURRENT_SOURCE_DIR}/cppbuild/googletest-1.14.0.zip
256+
URL_MD5 b4911e882c51cba34bebfb5df500a650)
257257

258258
FetchContent_MakeAvailable(gmock)
259259
endif ()

aeron-test-support/src/main/java/io/aeron/test/SystemTestWatcher.java

+4
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,10 @@ public void afterTestExecution(final ExtensionContext context)
149149
@SuppressWarnings("methodlength")
150150
public void afterEach(final ExtensionContext context)
151151
{
152+
if (0 == endTimeNs)
153+
{
154+
endTimeNs = System.nanoTime();
155+
}
152156
Thread.interrupted(); // clean the interrupted flag
153157
Throwable error = context.getExecutionException()
154158
.filter((t) -> !(t instanceof TestAbortedException))

cppbuild/googletest-1.14.0.zip

1.04 MB
Binary file not shown.
-1.03 MB
Binary file not shown.

0 commit comments

Comments
 (0)