From f3e193b2651b2589daecaf181b96c5622acc51e9 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 16 Jun 2017 14:57:47 +0200
Subject: Clean up module-related diagnostics

---
 tests/cc/modules/testscript      | 4 ++--
 tests/cc/preprocessed/testscript | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'tests/cc')

diff --git a/tests/cc/modules/testscript b/tests/cc/modules/testscript
index c259014..50dc9b2 100644
--- a/tests/cc/modules/testscript
+++ b/tests/cc/modules/testscript
@@ -160,7 +160,7 @@ $* test clean <<EOI
 :
 ln -s ../driver.cxx ./;
 $* test &*.d <'exe{test}: cxx{driver}' 2>>EOE != 0
-  error: unresolved import for module foo.core
+  driver.cxx: error: unable to resolve module foo.core
   EOE
 
 : misguessed
@@ -168,7 +168,7 @@ $* test &*.d <'exe{test}: cxx{driver}' 2>>EOE != 0
 ln -s ../core.mxx ./;
 cat <'import bar.core;' >=driver.cxx;
 $* test &*.d <'exe{test}: cxx{driver} mxx{core}' 2>>EOE != 0
-  error: failed to correctly guess module name from mxx{core}
+  driver.cxx: error: failed to correctly guess module name from mxx{core}
     info: guessed: bar.core
     info: actual:  foo.core
     info: consider adjusting module interface file names or
diff --git a/tests/cc/preprocessed/testscript b/tests/cc/preprocessed/testscript
index 8875f7a..b429853 100644
--- a/tests/cc/preprocessed/testscript
+++ b/tests/cc/preprocessed/testscript
@@ -98,7 +98,7 @@ $* &test* <<EOI 2>>EOE != 0
   cc.preprocessed = modules
   exe{test}: cxx{test}
   EOI
-  error: modules support not enabled or unavailable
+  test.cxx: error: modules support not enabled/available
   EOE
 
 : all
-- 
cgit v1.1