Skip to content

Commit

Permalink
Merge pull request #199 from FGasper/macos_ci
Browse files Browse the repository at this point in the history
Enable testing in macOS CI
  • Loading branch information
wtoorop authored Jul 12, 2024
2 parents 91a45ad + 924e19d commit f2b2ec7
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 13 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/testsuite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,7 @@ jobs:
# macOS’s system OpenSSL (LibreSSL, actually) isn’t meant for linking,
# and Homebrew’s# OpenSSL isn’t CI-friendly. So build without OpenSSL.
- run: ./configure --without-ssl --disable-sha2 --disable-gost --disable-ecdsa --disable-dane

# As of now the test suite requires OpenSSL, so no tests.
# cf. https://github.com/NLnetLabs/ldns/issues/162
- run: make
- run: make test

# Pending https://github.com/NLnetLabs/ldns/issues/197,
# only builds succeed here.
Expand Down
25 changes: 16 additions & 9 deletions test/18-drill-tests1.tpkg/18-drill-tests1.test
Original file line number Diff line number Diff line change
Expand Up @@ -57,17 +57,24 @@ wait_ldns_testns_up $TMPF1
PORT=`cat $TMPF1 | grep Listening | cut -d " " -f 4`

echo "../../drill/drill -p $PORT -k test2-key -S @localhost ok.ok.test.jelte.nlnetlabs.nl"
../../drill/drill -p $PORT -k test2-key -S @localhost ok.ok.test.jelte.nlnetlabs.nl> $TMPF2

if [[ $? -ne 0 ]]; then
cat $TMPF2
if grep "No trusted keys found in tree: first error was: DNSSEC signature has expired" $TMPF2; then
echo "yes it is expired"
else
echo "Error in chase"
RESULT=1
fi
if ../../drill/drill -h | grep \\s\\-S\\s >/dev/null; then
../../drill/drill -p $PORT -k test2-key -S @localhost ok.ok.test.jelte.nlnetlabs.nl> $TMPF2

if [[ $? -ne 0 ]]; then
cat $TMPF2
if grep "No trusted keys found in tree: first error was: DNSSEC signature has expired" $TMPF2; then
echo "yes it is expired"
else
echo "Error in chase"
RESULT=1
fi
fi

else
echo "SKIP (drill lacks -S)"
fi

../../drill/drill -p $PORT -t CH TXT server.stop. @localhost

# make sure testns server is stopped
Expand Down

0 comments on commit f2b2ec7

Please sign in to comment.