Commit 6c7c76e0e4a760d594113b3afe0147a178d9e58e
1 parent
2e35ead5
Fix issues with abi-perf-test
Showing
2 changed files
with
16 additions
and
9 deletions
README-maintainer
| ... | ... | @@ -353,7 +353,7 @@ RELEASE PREPARATION |
| 353 | 353 | |
| 354 | 354 | * Test for performance and binary compatibility: |
| 355 | 355 | |
| 356 | - ./abi-perf-test release-<old> @ | |
| 356 | + ./abi-perf-test v<old> @ | |
| 357 | 357 | |
| 358 | 358 | Prefix with SKIP_PERF=1 to skip performance test. |
| 359 | 359 | Prefix with SKIP_TESTS=1 to skip test suite run. | ... | ... |
abi-perf-test
| ... | ... | @@ -89,6 +89,7 @@ $source/check_abi compare --old-lib $work/old/libqpdf.so.*.* \ |
| 89 | 89 | --new-lib build/libqpdf/libqpdf.so \ |
| 90 | 90 | --old-sizes $work/old/sizes --new-sizes $work/new/sizes |
| 91 | 91 | |
| 92 | +test_warn=0 | |
| 92 | 93 | if [ "$SKIP_TESTS" != "1" ]; then |
| 93 | 94 | # Switch back to the previous release and run tests. There may be |
| 94 | 95 | # some failures based on functionality change. We are looking for |
| ... | ... | @@ -97,14 +98,7 @@ if [ "$SKIP_TESTS" != "1" ]; then |
| 97 | 98 | set +e |
| 98 | 99 | (cd build; ctest --verbose) |
| 99 | 100 | if [ $? != 0 ]; then |
| 100 | - cat <<EOF | |
| 101 | - | |
| 102 | -********************************************************************** | |
| 103 | -There were some test failures; inspect to determine whether they are | |
| 104 | -ABI-related. | |
| 105 | -********************************************************************** | |
| 106 | - | |
| 107 | -EOF | |
| 101 | + test_warn=1 | |
| 108 | 102 | fi |
| 109 | 103 | set -e |
| 110 | 104 | fi |
| ... | ... | @@ -121,3 +115,16 @@ if [ "$SKIP_PERF" != "1" ]; then |
| 121 | 115 | $source/performance_check --dir $source/../performance-test-files | \ |
| 122 | 116 | tee -a $work/perf |
| 123 | 117 | fi |
| 118 | + | |
| 119 | +if [ $test_warn = 1 ]; then | |
| 120 | + cat <<EOF | |
| 121 | + | |
| 122 | +********************************************************************** | |
| 123 | +There were some test failures; inspect to determine whether they are | |
| 124 | +ABI-related. | |
| 125 | + | |
| 126 | +Check test results in $work/qpdf/build | |
| 127 | +********************************************************************** | |
| 128 | + | |
| 129 | +EOF | |
| 130 | +fi | ... | ... |