s416496/musique
1
0
Fork 0
Code Issues 3 Pull Requests 1 Projects Releases Wiki Activity

Better unit test response messages when unrecoverable state reached

Browse Source 
Instead of `exit` we throw `std::runtime_error` in Debug mode assertions
and unreachable functions, to have better response from unit test runner.
This commit is contained in:
Robert Bendun 2022-06-19 16:09:39 +02:00
parent ed3b2006e9
commit 2dd97709a0
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -2,7 +2,7 @@ MAKEFLAGS="-j $(grep -c ^processor /proc/cpuinfo)"
CXXFLAGS:=$(CXXFLAGS) -std=c++20 -Wall -Wextra -Werror=switch -Werror=return-type -Werror=unused-result CXXFLAGS:=$(CXXFLAGS) -std=c++20 -Wall -Wextra -Werror=switch -Werror=return-type -Werror=unused-result
CPPFLAGS:=$(CPPFLAGS) -Ilib/expected/ -Ilib/ut/ -Ilib/midi/include -Isrc/ -Ilib/bestline/ CPPFLAGS:=$(CPPFLAGS) -Ilib/expected/ -Ilib/ut/ -Ilib/midi/include -Isrc/ -Ilib/bestline/
RELEASE_FLAGS=-O3 RELEASE_FLAGS=-O3
DEBUG_FLAGS=-O0 -ggdb -fsanitize=undefined DEBUG_FLAGS=-O0 -ggdb -fsanitize=undefined -DDebug
CXX=g++ CXX=g++
LDFLAGS=-L./lib/midi/ LDFLAGS=-L./lib/midi/

26
src/errors.cc
View File

@ -2,6 +2,7 @@
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
#include <stdexcept>
template<typename T, typename ...Params> template<typename T, typename ...Params>
concept Callable = requires(T t, Params ...params) { t(params...); }; concept Callable = requires(T t, Params ...params) { t(params...); };
@ -79,6 +80,10 @@ static void encourage_contact(std::ostream &os)
void assert(bool condition, std::string message, Location loc) void assert(bool condition, std::string message, Location loc)
{ {
if (condition) return; if (condition) return;
#if Debug
std::cout << "assertion failed at " << loc << " with message: " << message << std::endl;
throw std::runtime_error(message);
#else
error_heading(std::cerr, loc, Error_Level::Bug, "Assertion in interpreter"); error_heading(std::cerr, loc, Error_Level::Bug, "Assertion in interpreter");
if (not message.empty()) if (not message.empty())
@ -87,10 +92,18 @@ void assert(bool condition, std::string message, Location loc)
encourage_contact(std::cerr); encourage_contact(std::cerr);
std::exit(42); std::exit(42);
#endif
} }
[[noreturn]] void unimplemented(std::string_view message, Location loc) #if !Debug
[[noreturn]]
#endif
void unimplemented(std::string_view message, Location loc)
{ {
#if Debug
std::cout << "unreachable state reached at " << loc << " with message: " << message << std::endl;
throw std::runtime_error(std::string(message));
#else
error_heading(std::cerr, loc, Error_Level::Bug, "This part of interpreter was not implemented yet"); error_heading(std::cerr, loc, Error_Level::Bug, "This part of interpreter was not implemented yet");
if (not message.empty()) { if (not message.empty()) {
@ -100,13 +113,22 @@ void assert(bool condition, std::string message, Location loc)
encourage_contact(std::cerr); encourage_contact(std::cerr);
std::exit(42); std::exit(42);
#endif
} }
[[noreturn]] void unreachable(Location loc) #if !Debug
[[noreturn]]
#endif
void unreachable(Location loc)
{ {
#if Debug
std::cout << "unreachable state reached at " << loc << std::endl;
throw std::runtime_error("reached unreachable");
#else
error_heading(std::cerr, loc, Error_Level::Bug, "Reached unreachable state"); error_heading(std::cerr, loc, Error_Level::Bug, "Reached unreachable state");
encourage_contact(std::cerr); encourage_contact(std::cerr);
std::exit(42); std::exit(42);
#endif
} }
std::ostream& operator<<(std::ostream& os, Error const& err) std::ostream& operator<<(std::ostream& os, Error const& err)