RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 04:07:35 +00:00
Code Issues Activity Actions

AK: Remove exceptions from TestSuite.h.

Browse source 
Serenity is build with -fno-exceptions, this is an effort to make
TestSuite.h useable in the userland.
This commit is contained in:
asynts 2020-08-20 17:54:04 +02:00 • committed by Andreas Kling
parent d5999c3811
commit 20a7d2c61b
1 changed files with 1 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

34
AK/TestSuite.h
View file

@ -63,32 +63,6 @@ private:
std::chrono::time_point<clock> m_started; std::chrono::time_point<clock> m_started;
}; };
class TestException {
public:
TestException(const String& file, int line, const String& s)
: file(file)
, line(line)
, reason(s)
{
}
String to_string() const
{
String outfile = file;
// ###
//auto slash = file.lastIndexOf("/");
//if (slash > 0) {
// outfile = outfile.right(outfile.length() - slash - 1);
//}
return String::format("%s:%d: %s", outfile.characters(), line, reason.characters());
}
private:
String file;
int line = 0;
String reason;
};
typedef AK::Function<void()> TestFunction; typedef AK::Function<void()> TestFunction;
class TestCase : public RefCounted<TestCase> { class TestCase : public RefCounted<TestCase> {
@ -207,12 +181,7 @@ void TestSuite::run(const NonnullRefPtrVector<TestCase>& tests)
for (const auto& t : tests) { for (const auto& t : tests) {
dbg() << "START Running " << (t.is_benchmark() ? "benchmark" : "test") << " " << t.name(); dbg() << "START Running " << (t.is_benchmark() ? "benchmark" : "test") << " " << t.name();
TestElapsedTimer timer; TestElapsedTimer timer;
try { t.func()();
t.func()();
} catch (const TestException& t) {
fprintf(stderr, "\033[31;1mFAIL\033[0m: %s\n", t.to_string().characters());
exit(1);
}
auto time = timer.elapsed(); auto time = timer.elapsed();
fprintf(stderr, "\033[32;1mPASS\033[0m: %d ms running %s %s\n", (int)time, (t.is_benchmark() ? "benchmark" : "test"), t.name().characters()); fprintf(stderr, "\033[32;1mPASS\033[0m: %d ms running %s %s\n", (int)time, (t.is_benchmark() ? "benchmark" : "test"), t.name().characters());
if (t.is_benchmark()) { if (t.is_benchmark()) {
@ -230,7 +199,6 @@ void TestSuite::run(const NonnullRefPtrVector<TestCase>& tests)
} }
using AK::TestCase; using AK::TestCase;
using AK::TestException;
using AK::TestSuite; using AK::TestSuite;
#define xstr(s) ___str(s) #define xstr(s) ___str(s)