From 5741561d57b730905d1bcfddf88d52307bad2a42 Mon Sep 17 00:00:00 2001
From: Omar Polo <op@omarpolo.com>
Date: Thu, 9 Dec 2021 19:02:09 +0000
Subject: [PATCH] run all kinds of tests via tests.sh/runtime

while there also change the dependency in the makefile: iri_test should
be alone, not as deps of `data'.
---
 regress/Makefile |  6 ++----
 regress/runtime  |  2 ++
 regress/tests.sh | 10 ++++++++++
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/regress/Makefile b/regress/Makefile
index 2a12053..f319b95 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -6,12 +6,10 @@ include ../Makefile.local
 
 .PHONY: all data clean runtime
 
-all: data gg puny-test fcgi-test
-	./puny-test
-	./iri_test
+all: data gg puny-test iri_test fcgi-test
 	./runtime ${TESTS}
 
-data: testdata iri_test cert.pem testca.pem valid.crt invalid.cert.pem
+data: testdata cert.pem testca.pem valid.crt invalid.cert.pem
 
 gg: gg.o ../iri.o ../utf8.o ${COMPAT}
 	${CC} gg.o ../iri.o ../utf8.o ${COMPAT} -o $@ ${LDFLAGS}
diff --git a/regress/runtime b/regress/runtime
index 87af174..0cde4b1 100755
--- a/regress/runtime
+++ b/regress/runtime
@@ -25,6 +25,8 @@ if [ $# -ne 0 ]; then
 	tests_done
 fi
 
+run_test test_punycode
+run_test test_iri
 run_test test_configless_mode
 run_test test_static_files
 run_test test_directory_redirect
diff --git a/regress/tests.sh b/regress/tests.sh
index ccb7ea7..5b0ec81 100644
--- a/regress/tests.sh
+++ b/regress/tests.sh
@@ -1,3 +1,13 @@
+test_punycode() {
+	dont_check=yes
+	./puny-test
+}
+
+test_iri() {
+	dont_check=yes
+	./iri_test
+}
+
 test_configless_mode() {
 	dont_check=yes