From 2da8a18f16422c9c12c1426570158245a333f9ac Mon Sep 17 00:00:00 2001 From: zxzxzzz Date: Wed, 15 Dec 2021 15:01:06 +0800 Subject: [PATCH] fix pooltests result print --- patch-14-fix-pooltests-result-print.patch | 56 +++++++++++++++++++++++ zstd.spec | 8 +++- 2 files changed, 62 insertions(+), 2 deletions(-) create mode 100644 patch-14-fix-pooltests-result-print.patch diff --git a/patch-14-fix-pooltests-result-print.patch b/patch-14-fix-pooltests-result-print.patch new file mode 100644 index 0000000..40399d2 --- /dev/null +++ b/patch-14-fix-pooltests-result-print.patch @@ -0,0 +1,56 @@ +diff -Nur zstd-1.5.0/tests/poolTests.c zstd-1.5.0-new/tests/poolTests.c +--- zstd-1.5.0/tests/poolTests.c 2021-12-15 14:27:22.047664997 +0800 ++++ zstd-1.5.0-new/tests/poolTests.c 2021-12-15 14:40:08.926050471 +0800 +@@ -235,7 +235,7 @@ + + if (POOL_create(0, 1)) { /* should not be possible */ + printf("FAIL: should not create POOL with 0 threads\n"); +- DISPLAY("==== results; passed: 0/1, failed: 0/1, skipped: 0/1 ====\n"); ++ DISPLAY("==== results: passed: 0/1, failed: 0/1, skipped: 0/1 ====\n"); + return 1; + } + +@@ -246,14 +246,14 @@ + (unsigned)queueSize, (unsigned)numThreads); + if (testOrder(numThreads, queueSize)) { + printf("FAIL: testOrder\n"); +- DISPLAY("==== results; passed: %d/%d, failed: 1/%d, skipped: 0/%d ====\n", ++ DISPLAY("==== results: passed: %d/%d, failed: 1/%d, skipped: 0/%d ====\n", + testNb, (testNb+1), (testNb+1), (testNb+1)); + return 1; + } + printf("SUCCESS: testOrder\n");testNb++; + if (testWait(numThreads, queueSize)) { + printf("FAIL: testWait\n"); +- DISPLAY("==== results; passed: %d/%d, failed: 1/%d, skipped: 0/%d ====\n", ++ DISPLAY("==== results: passed: %d/%d, failed: 1/%d, skipped: 0/%d ====\n", + testNb, (testNb+1), (testNb+1), (testNb+1)); + return 1; + } +@@ -263,7 +263,7 @@ + + if (testThreadReduction()) { + printf("FAIL: thread reduction not effective \n"); +- DISPLAY("==== results; passed: %d/%d, failed: 1/%d, skipped: 0/%d ====\n", ++ DISPLAY("==== results: passed: %d/%d, failed: 1/%d, skipped: 0/%d ====\n", + testNb, (testNb+1), (testNb+1), (testNb+1)); + return 1; + } else { +@@ -272,7 +272,7 @@ + + if (testAbruptEnding()) { + printf("FAIL: jobs in queue not completed on early end \n"); +- DISPLAY("==== results; passed: %d/%d, failed: 1/%d, skipped: 0/%d ====\n", ++ DISPLAY("==== results: passed: %d/%d, failed: 1/%d, skipped: 0/%d ====\n", + testNb, (testNb+1), (testNb+1), (testNb+1)); + return 1; + } else { +@@ -280,7 +280,7 @@ + } + + printf("PASS: all POOL tests\n"); +- DISPLAY("==== results; passed: %d/%d, failed: 0/%d, skipped: 0/%d ====\n", ++ DISPLAY("==== results: passed: %d/%d, failed: 0/%d, skipped: 0/%d ====\n", + testNb, testNb, testNb, testNb); + + return 0; diff --git a/zstd.spec b/zstd.spec index 4448eb2..5bcd192 100644 --- a/zstd.spec +++ b/zstd.spec @@ -2,7 +2,7 @@ Name: zstd Version: 1.5.0 -Release: 16 +Release: 17 Summary: A fast lossless compression algorithm License: BSD and GPLv2 URL: https://github.com/facebook/zstd @@ -21,6 +21,7 @@ Patch10: backport-zstd-1.5.0-patch-10-fix-entropy-repeat-mode-bug.patch Patch11: backport-zstd-1.5.0-patch-11-Fix-progress-flag-to-properly-control-progress-display-and-default.patch Patch12: backport-zstd-1.5.0-patch-12-Z_PREFIX-zError-function.patch Patch13: backport-zstd-1.5.0-patch-13-fix-Add-missing-bounds-checks-during-compression.patch +Patch14: patch-14-fix-pooltests-result-print.patch BuildRequires: gtest-devel gcc-c++ pkg-config @@ -99,6 +100,9 @@ install -D -m644 programs/zstd.1 %{buildroot}%{_mandir}/man1/pzstd.1 %{_mandir}/man1/*.1* %changelog +* Wed Dec 15 2021 liushiyuan - 1.5.0.17 +* fix test-pool result print + * Tue Dec 14 2021 zhangxiao - 1.5.0.16 * fix Add missing bounds checks during compression @@ -111,7 +115,7 @@ install -D -m644 programs/zstd.1 %{buildroot}%{_mandir}/man1/pzstd.1 * Mon Dec 13 2021 zhangxiao - 1.5.0.13 * fix entropy repeat mode bug -* Fri Dec 13 2021 liushiyuan - 1.5.0.12 +* Mon Dec 13 2021 liushiyuan - 1.5.0.12 * add test c result print * Mon Dec 06 2021 helei - 1.5.0.11