From db4ec7a9db7a0d87d459d7dc80f9a2afb4cbeadb Mon Sep 17 00:00:00 2001 From: Jay Berkenbilt Date: Sat, 16 Dec 2023 11:04:41 -0500 Subject: [PATCH] Test qpdf + pikepdf with FUTURE --- .github/workflows/main.yml | 8 ++++++++ build-scripts/test-pikepdf | 12 +++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 03d6b929..7646a3d2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -118,6 +118,14 @@ jobs: - uses: actions/checkout@v3 - name: 'pikepdf' run: build-scripts/test-pikepdf + pikepdf-future: + runs-on: ubuntu-latest + # Run after pikepdf to save concurrent runners + needs: pikepdf + steps: + - uses: actions/checkout@v3 + - name: 'qpdf + pikepdf with FUTURE' + run: build-scripts/test-pikepdf future Fuzzers: runs-on: ubuntu-latest needs: Prebuild diff --git a/build-scripts/test-pikepdf b/build-scripts/test-pikepdf index e6c8a9a4..cdab79cf 100755 --- a/build-scripts/test-pikepdf +++ b/build-scripts/test-pikepdf @@ -1,10 +1,20 @@ #!/bin/bash set -ex +cmake_extra= +future=0 +if [ "$1" = "future" ]; then + future=1 + cmake_extra=-DFUTURE=ON +fi sudo apt-get update sudo apt-get -y install \ build-essential cmake zlib1g-dev libjpeg-dev libgnutls28-dev -cmake -S . -B build -DBUILD_STATIC_LIBS=0 -DCMAKE_BUILD_TYPE=RelWithDebInfo +cmake -S . -B build -DBUILD_STATIC_LIBS=0 -DCMAKE_BUILD_TYPE=RelWithDebInfo $cmake_extra cmake --build build --verbose -j$(nproc) --target libqpdf -- -k +if [ "$future" = "1" ]; then + # Run qpdf's test suite in FUTURE mode as well + ctest --verbose +fi export QPDF_SOURCE_TREE=$PWD export QPDF_BUILD_LIBDIR=$QPDF_SOURCE_TREE/build/libqpdf export LD_LIBRARY_PATH=$QPDF_BUILD_LIBDIR