Merge remote-tracking branch 'upstream/dev' into ldm-mergeDev

2017-09-06 15:56:32 -07:00
parent 8c33cfe0bc e6b0945c3e
commit eeff55dfa8
30 changed files with 2971 additions and 2597 deletions
@@ -407,10 +407,8 @@ static int BMK_benchMem(const void* srcBuffer, size_t srcSize,
                            blockTable[blockNb].cPtr, blockTable[blockNb].cSize,
                            ddict);
                        if (ZSTD_isError(regenSize)) {
-                            DISPLAY("ZSTD_decompress_usingDDict() failed on block %u of size %u : %s  \n",
+                            EXM_THROW(2, "ZSTD_decompress_usingDDict() failed on block %u of size %u : %s  \n",
                                      blockNb, (U32)blockTable[blockNb].cSize, ZSTD_getErrorName(regenSize));
-                            clockLoop = 0;   /* force immediate test end */
-                            break;
                        }
                        blockTable[blockNb].resSize = regenSize;
                    }