Skip to content

Commit ef2de63

Browse files
nodejs-github-botnodejs-github-bot
committed
deps: update zlib to 1.2.13.1-motley-3f0af7f
1 parent e4239f6 commit ef2de63

File tree

8 files changed

+93
-33
lines changed

8 files changed

+93
-33
lines changed

‎deps/zlib/CMakeLists.txt‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ check_include_file(stddef.h HAVE_STDDEF_H)
2424
option(ENABLE_SIMD_OPTIMIZATIONS "Enable all SIMD optimizations" OFF)
2525
option(ENABLE_SIMD_AVX512 "Enable SIMD AXV512 optimizations" OFF)
2626
option(USE_ZLIB_RABIN_KARP_HASH "Enable bitstream compatibility with canonical zlib" OFF)
27+
option(BUILD_UNITTESTS "Enable standalone unit tests build" OFF)
2728

2829
if (USE_ZLIB_RABIN_KARP_HASH)
2930
add_definitions(-DUSE_ZLIB_RABIN_KARP_ROLLING_HASH)
@@ -244,6 +245,58 @@ set(CMAKE_CXX_STANDARD 14) # workaround for older compilers (e.g. g++ 5.4).
244245
add_executable(zlib_bench contrib/bench/zlib_bench.cc)
245246
target_link_libraries(zlib_bench zlib)
246247

248+
#============================================================================
249+
# Unit Tests
250+
#============================================================================
251+
if (BUILD_UNITTESTS)
252+
include (ExternalProject)
253+
set_directory_properties(PROPERTIES EP_PREFIX ${CMAKE_BINARY_DIR}/third_party)
254+
ExternalProject_add(
255+
googletest
256+
GIT_REPOSITORY https://github.com/google/googletest.git
257+
GIT_TAG d1467f5813f4d363cfd11aba99c4e9fe47a85e99
258+
UPDATE_COMMAND ""
259+
INSTALL_COMMAND ""
260+
LOG_DOWNLOAD ON
261+
LOG_CONFIGURE ON
262+
LOG_BUILD ON
263+
)
264+
265+
# gtest includedir
266+
ExternalProject_Get_Property(googletest source_dir)
267+
set(GTEST_INCLUDE_DIRS
268+
${source_dir}/googletest/include
269+
${source_dir}/googletest/include/gtest
270+
)
271+
272+
# gtest library
273+
ExternalProject_Get_Property(googletest binary_dir)
274+
set(GTEST_LIBRARY_PATH ${binary_dir}/lib/${CMAKE_FIND_LIBRARY_PREFIXES}gtest.a)
275+
set(GTEST_LIBRARY gtest)
276+
add_library(${GTEST_LIBRARY} UNKNOWN IMPORTED)
277+
set_property(TARGET ${GTEST_LIBRARY} PROPERTY IMPORTED_LOCATION ${GTEST_LIBRARY_PATH})
278+
add_dependencies(${GTEST_LIBRARY} googletest)
279+
280+
set(UTEST_SRC
281+
${CMAKE_CURRENT_SOURCE_DIR}/contrib/tests/infcover.cc
282+
${CMAKE_CURRENT_SOURCE_DIR}/contrib/tests/infcover.h
283+
${CMAKE_CURRENT_SOURCE_DIR}/contrib/tests/utils_unittest.cc
284+
${CMAKE_CURRENT_SOURCE_DIR}/contrib/tests/standalone_test_runner.cc
285+
${CMAKE_CURRENT_SOURCE_DIR}/google/compression_utils_portable.cc
286+
)
287+
288+
add_compile_definitions(CMAKE_STANDALONE_UNITTESTS)
289+
290+
add_executable(zlib_unittests ${UTEST_SRC})
291+
target_include_directories(zlib_unittests PUBLIC ${GTEST_INCLUDE_DIRS})
292+
target_include_directories(zlib_unittests PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/google)
293+
294+
target_link_libraries(zlib_unittests ${GTEST_LIBRARY})
295+
target_link_libraries(zlib_unittests zlib)
296+
# Needed by gtest
297+
target_link_libraries(zlib_unittests pthread)
298+
endif()
299+
247300
#============================================================================
248301
# Minigzip tool
249302
#============================================================================

‎deps/zlib/README.chromium‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Version: 1.2.13
55
CPEPrefix: cpe:/a:zlib:zlib:1.2.13
66
Security Critical: yes
77
Shipped: yes
8-
License: Custom license
8+
License: Zlib
99
License File: LICENSE
1010
License Android Compatible: yes
1111

‎deps/zlib/contrib/optimizations/inflate.c‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1488,8 +1488,9 @@ int ZEXPORT inflateCopy(z_streamp dest, z_streamp source) {
14881488
if (copy == Z_NULL) return Z_MEM_ERROR;
14891489
window = Z_NULL;
14901490
if (state->window != Z_NULL) {
1491-
window = (unsigned char FAR *)
1492-
ZALLOC(source, 1U << state->wbits, sizeof(unsigned char));
1491+
window = (unsigned char FAR *)ZALLOC(
1492+
source, (1U << state->wbits) + CHUNKCOPY_CHUNK_SIZE,
1493+
sizeof(unsigned char));
14931494
if (window == Z_NULL) {
14941495
ZFREE(source, copy);
14951496
return Z_MEM_ERROR;

‎deps/zlib/contrib/tests/standalone_test_runner.cc‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// Copyright 2023 The Chromium Authors
2+
// Use of this source code is governed by a BSD-style license that can be
3+
// found in the Chromium source repository LICENSE file.
4+
#include <gtest/gtest.h>
5+
6+
int main(int argc, char** argv) {
7+
::testing::InitGoogleTest(&argc, argv);
8+
return RUN_ALL_TESTS();
9+
}

‎deps/zlib/contrib/tests/utils_unittest.cc‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,17 @@
77
#include <cstddef>
88
#include <vector>
99

10-
#include "base/files/file_path.h"
11-
#include "base/files/scoped_temp_dir.h"
1210
#include "compression_utils_portable.h"
1311
#include "gtest.h"
12+
13+
#if !defined(CMAKE_STANDALONE_UNITTESTS)
14+
#include "base/files/file_path.h"
15+
#include "base/files/scoped_temp_dir.h"
16+
1417
#include "third_party/zlib/contrib/minizip/unzip.h"
1518
#include "third_party/zlib/contrib/minizip/zip.h"
19+
#endif
20+
1621
#include "zlib.h"
1722

1823
void TestPayloads(size_t input_size, zlib_internal::WrapperType type) {
@@ -1020,6 +1025,9 @@ TEST(ZlibTest, DeflateZFixedCorruption) {
10201025
0);
10211026
}
10221027

1028+
// TODO(gustavoa): make these tests run standalone.
1029+
#ifndef CMAKE_STANDALONE_UNITTESTS
1030+
10231031
TEST(ZlibTest, ZipFilenameCommentSize) {
10241032
// Check that minizip rejects zip member filenames or comments longer than
10251033
// the zip format can represent.
@@ -1138,3 +1146,5 @@ TEST(ZlibTest, ZipExtraFieldSize) {
11381146
EXPECT_EQ(unzGoToNextFile(uzf), UNZ_END_OF_LIST_OF_FILE);
11391147
EXPECT_EQ(unzClose(uzf), UNZ_OK);
11401148
}
1149+
1150+
#endif

‎deps/zlib/google/DEPS‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@ include_rules = [
22
'+base',
33
'+build',
44
'+testing',
5-
"+third_party/zlib/zlib.h",
5+
'+third_party/icu/source/i18n/unicode',
6+
'+third_party/zlib/zlib.h',
67
]

‎deps/zlib/google/zip_reader_unittest.cc‎

Lines changed: 10 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include "base/files/scoped_temp_dir.h"
2020
#include "base/functional/bind.h"
2121
#include "base/hash/md5.h"
22+
#include "base/i18n/time_formatting.h"
2223
#include "base/path_service.h"
2324
#include "base/run_loop.h"
2425
#include "base/strings/string_piece.h"
@@ -31,6 +32,7 @@
3132
#include "testing/gmock/include/gmock/gmock.h"
3233
#include "testing/gtest/include/gtest/gtest.h"
3334
#include "testing/platform_test.h"
35+
#include "third_party/icu/source/i18n/unicode/timezone.h"
3436
#include "third_party/zlib/google/zip_internal.h"
3537

3638
using ::testing::_;
@@ -288,18 +290,10 @@ TEST_F(ZipReaderTest, RegularFile) {
288290

289291
EXPECT_EQ(target_path, entry->path);
290292
EXPECT_EQ(13527, entry->original_size);
291-
292-
// The expected time stamp: 2009-05-29 06:22:20
293-
base::Time::Exploded exploded = {}; // Zero-clear.
294-
entry->last_modified.UTCExplode(&exploded);
295-
EXPECT_EQ(2009, exploded.year);
296-
EXPECT_EQ(5, exploded.month);
297-
EXPECT_EQ(29, exploded.day_of_month);
298-
EXPECT_EQ(6, exploded.hour);
299-
EXPECT_EQ(22, exploded.minute);
300-
EXPECT_EQ(20, exploded.second);
301-
EXPECT_EQ(0, exploded.millisecond);
302-
293+
EXPECT_EQ("2009-05-29 06:22:20.000",
294+
base::UnlocalizedTimeFormatWithPattern(entry->last_modified,
295+
"y-MM-dd HH:mm:ss.SSS",
296+
icu::TimeZone::getGMT()));
303297
EXPECT_FALSE(entry->is_unsafe);
304298
EXPECT_FALSE(entry->is_directory);
305299
}
@@ -396,18 +390,10 @@ TEST_F(ZipReaderTest, Directory) {
396390
EXPECT_EQ(target_path, entry->path);
397391
// The directory size should be zero.
398392
EXPECT_EQ(0, entry->original_size);
399-
400-
// The expected time stamp: 2009-05-31 15:49:52
401-
base::Time::Exploded exploded = {}; // Zero-clear.
402-
entry->last_modified.UTCExplode(&exploded);
403-
EXPECT_EQ(2009, exploded.year);
404-
EXPECT_EQ(5, exploded.month);
405-
EXPECT_EQ(31, exploded.day_of_month);
406-
EXPECT_EQ(15, exploded.hour);
407-
EXPECT_EQ(49, exploded.minute);
408-
EXPECT_EQ(52, exploded.second);
409-
EXPECT_EQ(0, exploded.millisecond);
410-
393+
EXPECT_EQ("2009-05-31 15:49:52.000",
394+
base::UnlocalizedTimeFormatWithPattern(entry->last_modified,
395+
"y-MM-dd HH:mm:ss.SSS",
396+
icu::TimeZone::getGMT()));
411397
EXPECT_FALSE(entry->is_unsafe);
412398
EXPECT_TRUE(entry->is_directory);
413399
}

‎doc/contributing/maintaining/maintaining-dependencies.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ This a list of all the dependencies:
3131
* [undici 5.23.0][]
3232
* [uvwasi 0.0.16][]
3333
* [V8 11.3.244.8][]
34-
* [zlib 1.2.13.1-motley-2359864][]
34+
* [zlib 1.2.13.1-motley-3f0af7f][]
3535

3636
Any code which meets one or more of these conditions should
3737
be managed as a dependency:
@@ -311,7 +311,7 @@ See [maintaining-web-assembly][] for more informations.
311311
high-performance JavaScript and WebAssembly engine, written in C++.
312312
See [maintaining-V8][] for more informations.
313313

314-
### zlib 1.2.13.1-motley-2359864
314+
### zlib 1.2.13.1-motley-3f0af7f
315315

316316
The [zlib](https://chromium.googlesource.com/chromium/src/+/refs/heads/main/third_party/zlib)
317317
dependency lossless data-compression library,
@@ -349,4 +349,4 @@ performance improvements not currently available in standard zlib.
349349
[update-openssl-action]: ../../../.github/workflows/update-openssl.yml
350350
[uvwasi 0.0.16]: #uvwasi-0016
351351
[v8 11.3.244.8]: #v8-1132448
352-
[zlib 1.2.13.1-motley-2359864]: #zlib-12131-motley-2359864
352+
[zlib 1.2.13.1-motley-3f0af7f]: #zlib-12131-motley-3f0af7f

0 commit comments

Comments
 (0)