Skip to content

Commit d5b9de2

Browse files
authored
Merge pull request #19912 from ghalliday/issue33599
HPCC-33599 Fix problem with lz4s[hc] and JlibCompressionTestsStress Reviewed-By: Attila Vamos <[email protected]> Merged-by: Gavin Halliday <[email protected]>
2 parents 00f0536 + 510fc5c commit d5b9de2

File tree

1 file changed

+13
-2
lines changed

1 file changed

+13
-2
lines changed

testing/unittests/jlibtests.cpp

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4202,8 +4202,11 @@ class JlibCompressionStandardTest : public JlibCompressionTestBase
42024202
}
42034203
catch (IException *e)
42044204
{
4205+
StringBuffer msg;
4206+
e->errorMessage(msg);
42054207
EXCLOG(e, nullptr);
4206-
throw;
4208+
::Release(e);
4209+
CPPUNIT_FAIL(msg.str());
42074210
}
42084211
}
42094212

@@ -4267,6 +4270,11 @@ class JlibCompressionTestsStress : public JlibCompressionTestBase
42674270
testCompressor(handler, "hclevel=8", rowSz, src.length(), src.bytes(), RowCompress);
42684271
testCompressor(handler, "hclevel=10", rowSz, src.length(), src.bytes(), RowCompress);
42694272
}
4273+
if (strieq(type, "lz4s") || strieq(type, "lz4shc"))
4274+
{
4275+
testCompressor(handler, options, rowSz, src.length(), src.bytes(), FixedBlockCompress);
4276+
continue;
4277+
}
42704278
testCompressor(handler, options, rowSz, src.length(), src.bytes(), RowCompress);
42714279
testCompressor(handler, options, rowSz, src.length(), src.bytes(), CompressToBuffer);
42724280
if (streq(type, "LZ4"))
@@ -4278,8 +4286,11 @@ class JlibCompressionTestsStress : public JlibCompressionTestBase
42784286
}
42794287
catch (IException *e)
42804288
{
4289+
StringBuffer msg;
4290+
e->errorMessage(msg);
42814291
EXCLOG(e, nullptr);
4282-
throw;
4292+
::Release(e);
4293+
CPPUNIT_FAIL(msg.str());
42834294
}
42844295
}
42854296

0 commit comments

Comments
 (0)