From bc3cda9b9fe7b1bc5720226d2c5a99919d56ea2c Mon Sep 17 00:00:00 2001 From: Nick Terrell Date: Thu, 10 Dec 2020 13:33:34 -0800 Subject: [PATCH] [CI][cmake] Disable --test-large-data and shorten fuzzing time to 2 mins --- .github/workflows/generic-dev.yml | 4 ++-- appveyor.yml | 2 ++ build/cmake/tests/CMakeLists.txt | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/generic-dev.yml b/.github/workflows/generic-dev.yml index 6b127aa7a..bb88de57c 100644 --- a/.github/workflows/generic-dev.yml +++ b/.github/workflows/generic-dev.yml @@ -90,10 +90,10 @@ jobs: - uses: actions/checkout@v2 - name: cmake build and test check run: | - make cmakebuild + FUZZERTEST=-T1mn ZSTREAM_TESTTIME=-T1mn make cmakebuild cp -r ./ "../zstd source" cd "../zstd source" - make cmakebuild + FUZZERTEST=-T1mn ZSTREAM_TESTTIME=-T1mn make cmakebuild gcc-8-asan-ubsan-fuzz: runs-on: ubuntu-latest diff --git a/appveyor.yml b/appveyor.yml index 6b5b97676..169c66bd6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -162,6 +162,8 @@ - if [%TEST%]==[cmake] ( mkdir build\cmake\build && cd build\cmake\build && + SET FUZZERTEST=-T2mn && + SET ZSTREAM_TESTTIME=-T2mn && cmake -G "Visual Studio 14 2015 Win64" .. && cd ..\..\.. && make clean diff --git a/build/cmake/tests/CMakeLists.txt b/build/cmake/tests/CMakeLists.txt index 9bc9ec411..34eca9109 100644 --- a/build/cmake/tests/CMakeLists.txt +++ b/build/cmake/tests/CMakeLists.txt @@ -84,7 +84,7 @@ add_test(NAME zstreamtest COMMAND zstreamtest ${ZSTD_ZSTREAM_FLAGS}) # # playTests.sh # -AddTestFlagsOption(ZSTD_PLAYTESTS_FLAGS "--test-large-data" +AddTestFlagsOption(ZSTD_PLAYTESTS_FLAGS "$ENV{PLAYTESTS_FLAGS}" "Semicolon-separated list of flags to pass to the playTests.sh test") add_test(NAME playTests COMMAND sh -c "\"${TESTS_DIR}/playTests.sh\" ${ZSTD_PLAYTESTS_FLAGS}") if (ZSTD_BUILD_PROGRAMS) -- 2.47.2