From 7ba094141ace918713a5e71b47b718aea3c02534 Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Mon, 22 May 2023 10:26:37 -0700 Subject: [PATCH] Don't use bash for symbols test Might fix #614? Signed-off-by: David Woodhouse --- tests/symbols | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/tests/symbols b/tests/symbols index d434103b..fe50cd67 100755 --- a/tests/symbols +++ b/tests/symbols @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh # # Symbol version checking OpenConnect # @@ -30,11 +30,7 @@ SYMBOLSFILE="${SYMBOLESFILE:-${top_srcdir}/libopenconnect5.symbols}" TMPSYMBOLS=symbols.$$.tmp -function cleanup { - rm -f ${TMPSYMBOLS} -} - -trap cleanup EXIT +trap "rm -f ${TMPSYMBOLS}" EXIT ( sed -Enf ${SEDFILE} ${OPENCONNECT_H} | \ sed -Enf- ${MAPFILE} ) > $TMPSYMBOLS @@ -64,7 +60,7 @@ APIMAJOR="$(sed -n 's/^#define OPENCONNECT_API_VERSION_MAJOR \(.*\)/\1/p' ${OPEN APIMINOR="$(sed -n 's/^#define OPENCONNECT_API_VERSION_MINOR \(.*\)/\1/p' ${OPENCONNECT_H})" LASTVER="$(sed -En "/^ \* API version [0-9]+.[0-9]+.*/{p;q;}" ${OPENCONNECT_H})" -if ! grep -q "API version $APIMAJOR.$APIMINOR" <<< "$LASTVER"; then +if ! echo "$LASTVER" | grep -q "API version $APIMAJOR.$APIMINOR"; then echo "API $APIMAJOR.$APIMINOR is not the latest?" exit 1 fi -- 2.50.1