这是indexloc提供的服务,不要输入任何密码
Skip to content

Conversation

@nmoinvaz
Copy link
Member

See #920 for background.

@codecov
Copy link

codecov bot commented Mar 27, 2021

Codecov Report

Merging #922 (63fa17f) into develop (b82d349) will decrease coverage by 4.05%.
The diff coverage is n/a.

❗ Current head 63fa17f differs from pull request most recent head 79e88eb. Consider uploading reports for the commit 79e88eb to get more accurate results
Impacted file tree graph

@@             Coverage Diff             @@
##           develop     #922      +/-   ##
===========================================
- Coverage    75.85%   71.79%   -4.06%     
===========================================
  Files           74       61      -13     
  Lines         8292     6613    -1679     
  Branches      1369     1137     -232     
===========================================
- Hits          6290     4748    -1542     
+ Misses        1472     1397      -75     
+ Partials       530      468      -62     
Flag Coverage Δ
macos_clang ?
macos_gcc ?
ubuntu_clang ?
ubuntu_clang_debug ?
ubuntu_clang_inflate_allow_invalid_dist ?
ubuntu_clang_inflate_strict ?
ubuntu_clang_mmap ?
ubuntu_clang_msan ?
ubuntu_gcc ?
ubuntu_gcc_aarch64 ?
ubuntu_gcc_aarch64_compat_no_opt ?
ubuntu_gcc_aarch64_no_acle ?
ubuntu_gcc_aarch64_no_neon ?
ubuntu_gcc_armhf ?
ubuntu_gcc_armhf_compat_no_opt ?
ubuntu_gcc_armhf_no_acle ?
ubuntu_gcc_armhf_no_neon ?
ubuntu_gcc_armsf ?
ubuntu_gcc_armsf_compat_no_opt ?
ubuntu_gcc_compat_no_opt ?
ubuntu_gcc_mingw_i686 ?
ubuntu_gcc_mingw_x86_64 ?
ubuntu_gcc_no_avx2 ?
ubuntu_gcc_no_pclmulqdq ?
ubuntu_gcc_no_sse2 ?
ubuntu_gcc_no_sse4 ?
ubuntu_gcc_o3 ?
ubuntu_gcc_osb 71.79% <ø> (ø)
ubuntu_gcc_ppc ?
ubuntu_gcc_ppc64 ?
ubuntu_gcc_ppc64le ?
ubuntu_gcc_s390x ?
ubuntu_gcc_sparc64 ?
win64_gcc ?
win64_gcc_compat_no_opt ?

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
arch/x86/chunkset_sse.c 0.00% <0.00%> (-100.00%) ⬇️
arch/x86/adler32_ssse3.c 0.00% <0.00%> (-94.83%) ⬇️
arch/x86/compare258_sse.c 0.00% <0.00%> (-92.00%) ⬇️
arch/x86/slide_sse.c 0.00% <0.00%> (-80.00%) ⬇️
trees_emit.h 0.00% <0.00%> (-65.83%) ⬇️
trees.c 5.74% <0.00%> (-57.68%) ⬇️
chunkset.c 0.00% <0.00%> (-55.00%) ⬇️
compare258.c 0.00% <0.00%> (-51.62%) ⬇️
adler32.c 38.88% <0.00%> (-45.49%) ⬇️
zutil_p.h 0.00% <0.00%> (-40.00%) ⬇️
... and 59 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b82d349...79e88eb. Read the comment docs.

@phprus
Copy link
Contributor

phprus commented Mar 27, 2021

Writing temporary test files to CMake build directory:

Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -1146,7 +1146,7 @@
                 "-DCOMPRESS_ARGS=${compress_args}"
                 "-DDECOMPRESS_ARGS=-d;-c"
                 -DINPUT=${CMAKE_CURRENT_SOURCE_DIR}/${path}
-                -DOUTPUT=${CMAKE_CURRENT_SOURCE_DIR}/${path}-${test_id}.gz
+                -DOUTPUT=${CMAKE_CURRENT_BINARY_DIR}/${path}-${test_id}.gz
                 -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/test-compress.cmake)
         endif()
     endmacro()
@@ -1209,6 +1209,7 @@
         "-DTARGET=${MINIGZIP_COMMAND}"
         "-DCOMPRESS_ARGS=-c;-k;-4"
         -DINPUT=${CMAKE_CURRENT_SOURCE_DIR}/test/GH-361/test.txt
+        -DOUTPUT=${CMAKE_CURRENT_BINARY_DIR}/test/GH-361/test.txt
         -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/test-compress.cmake)

     add_test(NAME GH-364
@@ -1217,6 +1218,7 @@
         "-DCOMPRESS_ARGS=1;5;9;3"
         "-DDECOMPRESS_TARGET=${MINIGZIP_COMMAND}"
         -DINPUT=${CMAKE_CURRENT_SOURCE_DIR}/test/GH-364/test.bin
+        -DOUTPUT=${CMAKE_CURRENT_BINARY_DIR}/test/GH-364/test.bin
         -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/test-compress.cmake)

     add_test(NAME GH-382
@@ -1226,6 +1228,7 @@
         "-DDECOMPRESS_ARGS=-c;-d;-m;1;-w;-15"
         -DGZIP_VERIFY=OFF
         -DINPUT=${CMAKE_CURRENT_SOURCE_DIR}/test/GH-382/defneg3.dat
+        -DOUTPUT=${CMAKE_CURRENT_BINARY_DIR}/test/GH-382/defneg3.dat
         -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/test-compress.cmake)

     add_test(NAME GH-536-segfault
@@ -1236,6 +1239,7 @@
         -DCOMPARE=OFF
         -DGZIP_VERIFY=OFF
         -DINPUT=${CMAKE_CURRENT_SOURCE_DIR}/test/data/lcet10.txt
+        -DOUTPUT=${CMAKE_CURRENT_BINARY_DIR}/test/data/lcet10.txt
         -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/test-compress.cmake)

     add_test(NAME GH-536-incomplete-read
@@ -1246,6 +1250,7 @@
         -DCOMPARE=OFF
         -DGZIP_VERIFY=OFF
         -DINPUT=${CMAKE_CURRENT_SOURCE_DIR}/test/data/lcet10.txt
+        -DOUTPUT=${CMAKE_CURRENT_BINARY_DIR}/test/data/lcet10.txt
         -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/test-compress.cmake)

     add_test(NAME GH-536-zero-stored-block
@@ -1256,6 +1261,7 @@
         -DCOMPARE=OFF
         -DGZIP_VERIFY=OFF
         -DINPUT=${CMAKE_CURRENT_SOURCE_DIR}/test/data/lcet10.txt
+        -DOUTPUT=${CMAKE_CURRENT_BINARY_DIR}/test/data/lcet10.txt
         -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/test-compress.cmake)

     add_test(NAME GH-751
@@ -1262,6 +1268,7 @@
         COMMAND ${CMAKE_COMMAND}
         "-DTARGET=${MINIGZIP_COMMAND}"
         -DINPUT=${CMAKE_CURRENT_SOURCE_DIR}/test/GH-751/test.txt
+        -DOUTPUT=${CMAKE_CURRENT_BINARY_DIR}/test/GH-751/test.txt
         -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/test-compress.cmake)

     add_simple_test_executable(deflate_quick_bi_valid)
Index: cmake/test-compress.cmake
===================================================================
--- cmake/test-compress.cmake
+++ cmake/test-compress.cmake
@@ -60,6 +60,8 @@
     set(OUTPUT ${OUTPUT}-${UNIQUE_ID})
 endif()
 string(REPLACE ".gz" "" OUTPUT "${OUTPUT}")
+get_filename_component(OUTPUT_DIR "${OUTPUT}" DIRECTORY)
+file(MAKE_DIRECTORY "${OUTPUT_DIR}")

 macro(cleanup)
     # Cleanup temporary mingizip files

@nmoinvaz
Copy link
Member Author

It looks like I missed some files. I'm not sure if I want it to keep the directory structure.

@mtl1979
Copy link
Collaborator

mtl1979 commented Mar 28, 2021

@nmoinvaz Preserving the directory structure is useful if several tests have same filename for output... It also makes it easier to find any relevant temporary and output files if something goes wrong...

@nmoinvaz
Copy link
Member Author

The test-compress CMake script already generates unique file names so that shouldn't be a problem.

@nmoinvaz nmoinvaz force-pushed the fixes/cmake-bin-test-files branch from a651d5a to b01194a Compare April 11, 2021 18:14
@nmoinvaz
Copy link
Member Author

nmoinvaz commented Apr 11, 2021

I have included recent changes from @phprus by modifying test-compress.cmake to take a parameter called TEST_NAME and always build the output files in CMAKE_CURRENT_BINARY_DIR. It didn't make sense specifying the OUTPUT variable for this CMake test script since the output files always had some kind of extension added to it so the OUTPUT variable was not actually the output file - and the fact that there are multiple files written out during the test aided in that decision.

Files written (and later cleaned up) during test-compress tests look like this now:

image

Also OUTPUT script variable was never defined in the comments for test-compress.cmake.

…he name of the test.

Co-authored-by: Vladislav Shchapov <phprus@users.noreply.github.com>
@nmoinvaz nmoinvaz force-pushed the fixes/cmake-bin-test-files branch from b01194a to 79e88eb Compare April 11, 2021 18:22
@Dead2 Dead2 merged commit 70288f1 into zlib-ng:develop Apr 14, 2021
Dead2 added a commit that referenced this pull request May 8, 2021
- Include porting guide in release packages #917
- Documentation improvements #913 #949
- Added Windows ARM binaries in release packages #916
- Fix crash on ARMv7 #927
- Fix building on FreeBSD #921
- Fix building with musl on aarch64 #936
- Fix ARM float-abi detection #918
- Fix cmake detection of risc-v architectures #942
- Minor buildsystem fixes #922 #924 #933 #938 #950
- Improve zlib-compat build #915 #944
- CI/Test improvements #926 #929 #925 #937 #939 #940
Dead2 added a commit that referenced this pull request May 8, 2021
- Include porting guide in release packages #917
- Documentation improvements #913 #949
- Added Windows ARM binaries in release packages #916
- Fix crash on ARMv7 #927
- Fix building on FreeBSD #921
- Fix building with musl on aarch64 #936
- Fix ARM float-abi detection #918
- Fix cmake detection of risc-v architectures #942
- Minor buildsystem fixes #922 #924 #933 #938 #950
- Improve zlib-compat build #915 #944
- CI/Test improvements #926 #929 #927 #937 #939 #940
@Dead2 Dead2 mentioned this pull request May 8, 2021
Dead2 added a commit that referenced this pull request May 8, 2021
- Include porting guide in release packages #917
- Documentation improvements #913 #949
- Added Windows ARM binaries in release packages #916
- Fix crash on ARMv7 #927
- Fix building on FreeBSD #921
- Fix building with musl on aarch64 #936
- Fix ARM float-abi detection #918
- Fix cmake detection of risc-v architectures #942
- Minor buildsystem fixes #922 #924 #933 #938 #950
- Improve zlib-compat build #915 #944
- CI/Test improvements #926 #929 #927 #937 #939 #940
Dead2 added a commit that referenced this pull request May 9, 2021
- Include porting guide in release packages #917
- Documentation improvements #913 #949
- Added Windows ARM binaries in release packages #916
- Fix crash on ARMv7 #927
- Fix building on FreeBSD #921
- Fix building with musl on aarch64 #936 #952
- Fix ARM float-abi detection #918
- Fix cmake detection of risc-v architectures #942
- Minor buildsystem fixes #922 #924 #933 #938 #950
- Improve zlib-compat build #915 #944
- CI/Test improvements #926 #929 #927 #937 #939 #940
Dead2 added a commit that referenced this pull request May 13, 2021
- Include porting guide in release packages #917
- Documentation improvements #913 #949
- Added Windows ARM binaries in release packages #916
- Fix crash on ARMv7 #927
- Fix building on FreeBSD #921
- Fix building with musl on aarch64 #936 #952
- Fix ARM float-abi detection #918
- Fix cmake detection of risc-v architectures #942
- Minor buildsystem fixes #922 #924 #933 #938 #950
- Improve zlib-compat build #915 #944
- CI/Test improvements #926 #929 #927 #937 #939 #940
gsjaardema pushed a commit to gsjaardema/zlib-ng that referenced this pull request May 13, 2021
- Include porting guide in release packages zlib-ng#917
- Documentation improvements zlib-ng#913 zlib-ng#949
- Added Windows ARM binaries in release packages zlib-ng#916
- Fix crash on ARMv7 zlib-ng#927
- Fix building on FreeBSD zlib-ng#921
- Fix building with musl on aarch64 zlib-ng#936 zlib-ng#952
- Fix ARM float-abi detection zlib-ng#918
- Fix cmake detection of risc-v architectures zlib-ng#942
- Minor buildsystem fixes zlib-ng#922 zlib-ng#924 zlib-ng#933 zlib-ng#938 zlib-ng#950
- Improve zlib-compat build zlib-ng#915 zlib-ng#944
- CI/Test improvements zlib-ng#926 zlib-ng#929 zlib-ng#927 zlib-ng#937 zlib-ng#939 zlib-ng#940
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants