rewrite pq_test to perform internal checks

This change prepares for the patch at
https://marc.info/?l=openbsd-tech&m=174634767904894&w=2 by removing the
need for pq_expected.txt, pq_test.sh, and pq_test.bat. The test now
performs internal output and priority verification in code, simplifying
the test infrastructure across platforms.

Update CMakeLists.txt and Makefile.am accordingly.

5 files changed, 2 insertions, 35 deletions

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index d7cc499..417e093 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -620,13 +620,7 @@ add_platform_test(policy policy)
 # pq_test
 add_executable(pq_test pq_test.c)
 target_link_libraries(pq_test ${OPENSSL_TEST_LIBS})
-if(NOT WIN32)
-        add_test(NAME pq_test COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/pq_test.sh)
-else()
-        add_test(NAME pq_test COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/pq_test.bat
-                $<TARGET_FILE:pq_test>)
-endif()
-set_tests_properties(pq_test PROPERTIES ENVIRONMENT "srcdir=${TEST_SOURCE_DIR}")
+add_platform_test(pq_test pq_test)
 
 # quictest
 set(QUICTEST_SRC quictest.c)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index b58de21..23f8557 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -656,11 +656,9 @@ EXTRA_DIST += policy_root2.pem
 EXTRA_DIST += policy_root_cross_inhibit_mapping.pem
 
 # pq_test
-TESTS += pq_test.sh
+TESTS += pq_test
 check_PROGRAMS += pq_test
 pq_test_SOURCES = pq_test.c
-EXTRA_DIST += pq_test.sh pq_test.bat
-EXTRA_DIST += pq_expected.txt
 
 # quictest
 TESTS += quictest.sh
diff --git a/tests/pq_test.bat b/tests/pq_test.bat
deleted file mode 100644
index 084f06d..0000000
--- a/tests/pq_test.bat
+++ /dev/null
@@ -1,15 +0,0 @@
-@echo off

-setlocal enabledelayedexpansion

-REM     pq_test.bat

-

-set pq_test_bin=%1

-set pq_test_bin=%pq_test_bin:/=\%

-if not exist %pq_test_bin% exit /b 1

-

-set pq_output=pq_output.txt

-if exist %pq_output% del %pq_output%

-

-%pq_test_bin% > %pq_output%

-fc /b %pq_output% %srcdir%\pq_expected.txt

-

-endlocal

diff --git a/tests/pq_test.sh b/tests/pq_test.sh
deleted file mode 100755
index eab6f3c..0000000
--- a/tests/pq_test.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-set -e
-TEST=./pq_test
-if [ -e ./pq_test.exe ]; then
-        TEST=./pq_test.exe
-elif [ -e ./pq_test.js ]; then
-        TEST="node ./pq_test.js"
-fi
-$TEST | diff -b $srcdir/pq_expected.txt -
diff --git a/update.sh b/update.sh
index 9636ee7..eec551c 100755
--- a/update.sh
+++ b/update.sh
@@ -376,7 +376,6 @@ done
 $CP $libssl_regress/unit/tests.h tests
 $CP $libssl_regress/certs/*.pem tests
 $CP $libssl_regress/certs/*.crl tests
-$CP $libssl_regress/pqueue/expected.txt tests/pq_expected.txt
 
 # copy libtls tests
 for i in `find $libtls_regress -name '*.c'`; do