From 679f9767ea6246b02ce4e8142083878ffb99e4cb Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Fri, 12 Mar 2021 22:08:16 +0100
Subject: Merging upstream version 2.5.0+debian.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 src/test/Makefile.am | 6 +++---
 src/test/datafile4   | 3 +++
 src/test/test2.sh    | 6 +++---
 src/test/test4.sh    | 9 +++++++++
 4 files changed, 18 insertions(+), 6 deletions(-)
 create mode 100644 src/test/datafile4
 create mode 100755 src/test/test4.sh

(limited to 'src/test')

diff --git a/src/test/Makefile.am b/src/test/Makefile.am
index 9b3e7c2..377edea 100644
--- a/src/test/Makefile.am
+++ b/src/test/Makefile.am
@@ -1,9 +1,9 @@
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
 
 CLEANFILES = test*.log test*.trs \
-  test2.out
+  test2.out test4.out test4err.out
 
-TESTS = test1.sh test2.sh test3.sh
+TESTS = test1.sh test2.sh test3.sh test4.sh
 
 EXTRA_DIST = $(TESTS) \
-  datafile datafile2 updatefile
+  datafile datafile2 updatefile datafile3 datafile4
diff --git a/src/test/datafile4 b/src/test/datafile4
new file mode 100644
index 0000000..3193ed1
--- /dev/null
+++ b/src/test/datafile4
@@ -0,0 +1,3 @@
+api-read.facebook.com.\002\004\003\002\002\002\002\005\004\004\003\004\006\005\006\006\006\005\006\006\006\007\009\008\006\007\009\007\006\006\008\011\008\009\010\010\010\010\010\006\008\011\012\011\010\012\009\010\010\010\255\219. A
+valid\.quote.com A
+invalid\0quote.com A
diff --git a/src/test/test2.sh b/src/test/test2.sh
index a4cfce0..56932f9 100755
--- a/src/test/test2.sh
+++ b/src/test/test2.sh
@@ -16,7 +16,7 @@ grep -q "Queries sent: *4" test2.out
 ../dnsperf -s $ip -d "$srcdir/datafile" -n 1 -m tcp >test2.out
 cat test2.out
 grep -q "Queries sent: *2" test2.out
-../dnsperf -s $ip -d "$srcdir/datafile" -n 1 -m tls >test2.out
+../dnsperf -s $ip -d "$srcdir/datafile" -n 1 -m dot >test2.out
 cat test2.out
 grep -q "Queries sent: *2" test2.out
 ../dnsperf -s $ip -d "$srcdir/datafile" -n 1 -m dot >test2.out
@@ -70,7 +70,7 @@ grep -q "Queries sent: *2" test2.out
 
 # Ignore failure until https://github.com/DNS-OARC/dnsperf/issues/88 is fixed
 # May work on slower systems
-../resperf -s $ip -m 1 -d "$srcdir/datafile2" -r 2 -c 2 -M tls || true
+../resperf -s $ip -m 1 -d "$srcdir/datafile2" -r 2 -c 2 -M dot || true
 
 done # for ip
 
@@ -78,7 +78,7 @@ done # for ip
 sleep 2
 pkill -KILL -u `id -u` dnsperf || true
 
-../dnsperf -s 127.66.66.66 -d "$srcdir/datafile" -vvvv -m tls -n 1 &
+../dnsperf -s 127.66.66.66 -d "$srcdir/datafile" -vvvv -m dot -n 1 &
 sleep 2
 pkill -KILL -u `id -u` dnsperf || true
 
diff --git a/src/test/test4.sh b/src/test/test4.sh
new file mode 100755
index 0000000..5b334af
--- /dev/null
+++ b/src/test/test4.sh
@@ -0,0 +1,9 @@
+#!/bin/sh -xe
+
+test "$TEST_DNSPERF_WITH_NETWORK" = "1" || exit 0
+
+../dnsperf -vvv -d "$srcdir/datafile4" -t 0 -s 127.0.0.1 >test4.out 2>test4err.out
+
+grep 'api-read.facebook.com.\\002\\004\\003\\002\\002\\002\\002\\005\\004\\004\\003\\004\\006\\005\\006\\006\\006\\005\\006\\006\\006\\007\\009\\008\\006\\007\\009\\007\\006\\006\\008\\011\\008\\009\\010\\010\\010\\010\\010\\006\\008\\011\\012\\011\\010\\012\\009\\010\\010\\010\\255\\219. A' test4.out
+grep 'T valid\\.quote.com A' test4.out
+grep 'Warning: invalid domain name (or out of space): invalid\\0quote.com' test4err.out
-- 
cgit v1.2.3