From cf4c14f9f8058760709cc609a1425f2b9d54daa6 Mon Sep 17 00:00:00 2001
From: Jonathan Bernard <jonathan@jdbernard.com>
Date: Tue, 2 May 2023 21:32:30 -0500
Subject: [PATCH] Makefiles: update tests to ignore the BareExcept warning.

The `unittest` library still contains a number of bare exceptions, which
now result in warnings from the compliler. Patching the standard library
to remove these warnings is outside the scope of this project, so we're
going to ignore these warnings.
---
 .gitignore |  1 +
 Makefile   | 19 ++++++++-----------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4d933ea..b8e04e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@ tests/*
 !tests/*.*
 
 
+bin/
 *.sw?
diff --git a/Makefile b/Makefile
index 1ce2450..9c62487 100644
--- a/Makefile
+++ b/Makefile
@@ -5,25 +5,22 @@ SOURCES=$(call rwildcard,src/,*.nim)
 TEST_SOURCES=$(wildcard tests/*.nim)
 TESTS=$(patsubst %.nim,bin/%,$(TEST_SOURCES))
 
-.PHONY: test
-test: $(TESTS) $(SOURCES)
-	@for t in $(TESTS); do $$t; done
-
-.PHONY: watch-tests
-watch-tests:
-	watch 'make test' src tests --wait=10
-
 .PHONY: build
 build: test
 	nimble build
 
+.PHONY: test
+test:
+	#@for t in $(TESTS); do $$t; done
+	nimble --warning:BareExcept:off test
+
 .PHONY: install
 install: test
 	nimble install
 
-diagrams: doc/vcard3.mmd doc/vcard4.mmd
+diagrams: doc/vcard3.mmd
 	mmdc -i doc/vcard3.mmd -o doc/vcard3.png
-	mmdc -i doc/vcard4.mmd -o doc/vcard4.png
 
+# Target allowing for running individual tests.
 bin/tests/%: tests/%.nim $(SOURCES)
-	nim --outdir:bin/tests c $(patsubst bin/%,%.nim,$@)
+	nim --outdir:bin/tests --hints:off --warning:BareExcept:off c -r $(patsubst bin/%,%.nim,$@)