From 84b0dfe7c573d5bc734e14250067226592cfe7f8 Mon Sep 17 00:00:00 2001
From: wuestholz <unknown>
Date: Wed, 4 Jun 2014 10:44:29 +0200
Subject: Fixed issues with absolute file names in the expected output for the
 lit tests.

---
 Source/DafnyDriver/DafnyDriver.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'Source/DafnyDriver')

diff --git a/Source/DafnyDriver/DafnyDriver.cs b/Source/DafnyDriver/DafnyDriver.cs
index 7d8c3fdb..f1eedbba 100644
--- a/Source/DafnyDriver/DafnyDriver.cs
+++ b/Source/DafnyDriver/DafnyDriver.cs
@@ -312,6 +312,7 @@ namespace Microsoft.Dafny
         cp.ReferencedAssemblies.Add("System.Numerics.dll");
 
         var cr = provider.CompileAssemblyFromSource(cp, csharpProgram);
+        var assemblyName = Path.GetFileName(cr.PathToAssembly);
         if (DafnyOptions.O.RunAfterCompile && cr.Errors.Count == 0) {
           outputWriter.WriteLine("Program compiled successfully");
           outputWriter.WriteLine("Running...");
@@ -327,9 +328,9 @@ namespace Microsoft.Dafny
             outputWriter.WriteLine(e.ToString());
           }
         } else if (cr.Errors.Count == 0) {
-          outputWriter.WriteLine("Compiled assembly into {0}", DafnyOptions.Clo.UseBaseNameForFileName ? Path.GetFileName(cr.PathToAssembly) : cr.PathToAssembly);
+          outputWriter.WriteLine("Compiled assembly into {0}", assemblyName);
         } else {
-          outputWriter.WriteLine("Errors compiling program into {0}", DafnyOptions.Clo.UseBaseNameForFileName ? Path.GetFileName(cr.PathToAssembly) : cr.PathToAssembly);
+          outputWriter.WriteLine("Errors compiling program into {0}", assemblyName);
           foreach (var ce in cr.Errors) {
             outputWriter.WriteLine(ce.ToString());
             outputWriter.WriteLine();
-- 
cgit v1.2.3