Diagnostic infrastructure revamp

1 files changed, 5 insertions, 4 deletions

diff --git a/tests/build/lexer/driver.cxx b/tests/build/lexer/driver.cxx
index 739fa26..5b29b7d 100644
--- a/tests/build/lexer/driver.cxx
+++ b/tests/build/lexer/driver.cxx
@@ -22,6 +22,9 @@ lex (const char*);
 int
 main ()
 {
+  ostream cnull (nullptr);
+  diag_stream = &cnull;
+
   // Whitespaces.
   //
   assert (lex ("") == tokens ({""}));
@@ -71,8 +74,6 @@ main ()
           tokens ({"foo", ":", "\n", "bar", ""}));
 }
 
-ostream cnull (nullptr);
-
 static tokens
 lex (const char* s)
 {
@@ -80,7 +81,7 @@ lex (const char* s)
   istringstream is (s);
 
   is.exceptions (istream::failbit | istream::badbit);
-  lexer l (is, "", cnull);
+  lexer l (is, "");
 
   try
   {
@@ -106,7 +107,7 @@ lex (const char* s)
         break;
     }
   }
-  catch (const lexer_error&)
+  catch (const failed&)
   {
     r.push_back ("<lexer error>");
   }