Skip bzip2 compression entropy tests

Large block size makes the differential test fragile.

1 files changed, 5 insertions, 8 deletions

diff --git a/src/tests/test_entropy.cpp b/src/tests/test_entropy.cpp
index 675d8192e..9fe788ed4 100644
--- a/src/tests/test_entropy.cpp
+++ b/src/tests/test_entropy.cpp
@@ -52,15 +52,12 @@ class Entropy_Source_Tests : public Test
 #if defined(BOTAN_HAS_COMPRESSION)
                if(!rng.seed_material().empty())
                   {
-                  for(const std::string comp_algo : { "zlib", "bzip2", "lzma" })
+                  /*
+                  * Skip bzip2 both due to OS X problem (GH #394) and because bzip2's
+                  * large blocks cause the entropy differential test to fail sometimes.
+                  */
+                  for(const std::string comp_algo : { "zlib", "lzma" })
                      {
-#if defined(BOTAN_TARGET_OS_IS_DARWIN)
-                     if(comp_algo == "bzip2")
-                        {
-                        // Skip due to unresolved OS X specific issue GH #394
-                        continue;
-                        }
-#endif
                      std::unique_ptr<Botan::Compression_Algorithm> comp(Botan::make_compressor(comp_algo));
 
                      if(comp)