diff options
| author | Evan Nemerson <evan@nemerson.com> | 2016-07-28 13:31:09 -0700 |
|---|---|---|
| committer | Evan Nemerson <evan@nemerson.com> | 2016-07-28 19:32:33 -0700 |
| commit | 03657e8089d9022bbc8950b32d2c7fe07585572b (patch) | |
| tree | 3940d2ecee2df486c854facc512a27cc11355c0e /tests | |
| parent | bd3a5ada1a76841555411c597731a144f1a4eed4 (diff) | |
| download | brotli-03657e8089d9022bbc8950b32d2c7fe07585572b.zip brotli-03657e8089d9022bbc8950b32d2c7fe07585572b.tar.gz brotli-03657e8089d9022bbc8950b32d2c7fe07585572b.tar.bz2 | |
Add mingw support.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/run-compatibility-test.cmake | 2 | ||||
| -rw-r--r-- | tests/run-roundtrip-test.cmake | 13 |
2 files changed, 7 insertions, 8 deletions
diff --git a/tests/run-compatibility-test.cmake b/tests/run-compatibility-test.cmake index 9e7461b..0cc14d2 100644 --- a/tests/run-compatibility-test.cmake +++ b/tests/run-compatibility-test.cmake @@ -3,7 +3,7 @@ get_filename_component(OUTPUT_NAME "${REFERENCE_DATA}" NAME) execute_process( WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" - COMMAND ${BROTLI_CLI} -f -d -i "${INPUT}" -o "${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_NAME}.unbro" + COMMAND ${BROTLI_WRAPPER} ${BROTLI_CLI} --force --decompress --input ${INPUT} --output ${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_NAME}.unbro RESULT_VARIABLE result) if(result) message(FATAL_ERROR "Decompression failed") diff --git a/tests/run-roundtrip-test.cmake b/tests/run-roundtrip-test.cmake index 6cbd906..fbbd406 100644 --- a/tests/run-roundtrip-test.cmake +++ b/tests/run-roundtrip-test.cmake @@ -1,16 +1,15 @@ -get_filename_component(OUTPUT_NAME "${INPUT}" NAME) - execute_process( WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" - COMMAND ${BROTLI_CLI} -f -q ${QUALITY} -i "${INPUT}" -o "${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_NAME}.bro" - RESULT_VARIABLE result) + COMMAND ${BROTLI_WRAPPER} ${BROTLI_CLI} --force --quality ${QUALITY} --input ${INPUT} --output ${OUTPUT}.bro + RESULT_VARIABLE result + ERROR_VARIABLE result_stderr) if(result) - message(FATAL_ERROR "Compression failed") + message(FATAL_ERROR "Compression failed: ${result_stderr}") endif() execute_process( WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" - COMMAND ${BROTLI_CLI} -f -d -i "${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_NAME}.bro" -o "${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_NAME}.unbro" + COMMAND ${BROTLI_WRAPPER} ${BROTLI_CLI} --force --decompress --input ${OUTPUT}.bro --output ${OUTPUT}.unbro RESULT_VARIABLE result) if(result) message(FATAL_ERROR "Decompression failed") @@ -32,4 +31,4 @@ function(test_file_equality f1 f2) endif() endfunction() -test_file_equality("${INPUT}" "${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_NAME}.unbro") +test_file_equality("${INPUT}" "${OUTPUT}.unbro") |