Fix issues with abi-perf-test

2 files changed, 16 insertions, 9 deletions

diff --git a/README-maintainer b/README-maintainer
index e930e38c..545612c4 100644
--- a/README-maintainer
+++ b/README-maintainer
@@ -353,7 +353,7 @@ RELEASE PREPARATION
 
 * Test for performance and binary compatibility:
 
-  ./abi-perf-test release-<old> @
+  ./abi-perf-test v<old> @
 
   Prefix with SKIP_PERF=1 to skip performance test.
   Prefix with SKIP_TESTS=1 to skip test suite run.
diff --git a/abi-perf-test b/abi-perf-test
index b007ba53..8bd017b1 100755
--- a/abi-perf-test
+++ b/abi-perf-test
@@ -89,6 +89,7 @@ $source/check_abi compare --old-lib $work/old/libqpdf.so.*.* \
   --new-lib build/libqpdf/libqpdf.so \
   --old-sizes $work/old/sizes --new-sizes $work/new/sizes
 
+test_warn=0
 if [ "$SKIP_TESTS" != "1" ]; then
     # Switch back to the previous release and run tests. There may be
     # some failures based on functionality change. We are looking for
@@ -97,14 +98,7 @@ if [ "$SKIP_TESTS" != "1" ]; then
     set +e
     (cd build; ctest --verbose)
     if [ $? != 0 ]; then
-        cat <<EOF
-
-**********************************************************************
-There were some test failures; inspect to determine whether they are
-ABI-related.
-**********************************************************************
-
-EOF
+        test_warn=1
     fi
     set -e
 fi
@@ -121,3 +115,16 @@ if [ "$SKIP_PERF" != "1" ]; then
     $source/performance_check --dir $source/../performance-test-files | \
         tee -a $work/perf
 fi
+
+if [ $test_warn = 1 ]; then
+    cat <<EOF
+
+**********************************************************************
+There were some test failures; inspect to determine whether they are
+ABI-related.
+
+Check test results in $work/qpdf/build
+**********************************************************************
+
+EOF
+fi