Added necessary mv and rm commands on Windows

MikaelMayer · MikaelMayer · commit 73f2e43c1f70 · 2024-08-28T17:42:45.000-05:00
Fixed the tests
diff --git a/Source/IntegrationTests/LitTests.cs b/Source/IntegrationTests/LitTests.cs
@@ -132,6 +132,10 @@ IEnumerable<string> AddExtraArgs(IEnumerable<string> args, IEnumerable<string> l
           "%diff", (args, config) => DiffCommand.Parse(args.ToArray())
         }, {
           "%sed", (args, config) => SedCommand.Parse(args.ToArray())
+        }, {
+          "%mv", (args, config) => MvCommand.Parse(args.ToArray())
+        }, {
+          "%rm", (args, config) => RmCommand.Parse(args.ToArray())
         }, {
           "%OutputCheck", OutputCheckCommand.Parse
         }
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/gomodule/multimodule/test.doo b/Source/IntegrationTests/TestFiles/LitTests/LitTest/gomodule/multimodule/test.doo
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/multimodule/DerivedModule.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/multimodule/DerivedModule.dfy
@@ -1,8 +1,8 @@
-// RUN: %baredafny translate py  --python-module-name=PythonModule2 --library="%S/PythonModule1.doo" --translation-record "%S/PythonModule1-py.dtr" --output "%S/PythonModule2" "%s"
-// RUN: rm -rf "%S/PythonModule2"
-// RUN: mv "%S/PythonModule2-py" "%S/PythonModule2"
+// RUN: %baredafny translate py  --python-module-name=PythonModule2 --library="%S/PythonModule1.doo" --translation-record "%S/PythonModule1-py.dtr" --output "%S/PythonModule2" "%s" --include-runtime
+// RUN: %exits-with -any %rm -rf "%S/PythonModule2"
+// RUN: %mv "%S/PythonModule2-py" "%S/PythonModule2"
 // RUN: pip3 install "%S"
-// RUN: python3 %S/PythonModule2/ > %t
+// RUN: %S/python3 PythonModule2/ > %t
 // RUN: %diff "%s.expect" "%t"
 module DafnyModule3 {
 import DafnyModule1
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/multimodule/PythonModule1-py.dtr b/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/multimodule/PythonModule1-py.dtr
@@ -1,4 +1,4 @@
 file_format_version = "1.0"
-dafny_version = "4.7.0.0"
+dafny_version = "4.8.0.0"
 [options_by_module.DafnyModule1]
 python-module-name = "PythonModule1"
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/multimodule/PythonModule1.doo b/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/multimodule/PythonModule1.doo
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/multimodule/dafnysource/helloworld.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/multimodule/dafnysource/helloworld.dfy
@@ -0,0 +1,9 @@
+// This file is used to regenerate PythonModule1.doo
+// RUN: echo 'lit should ignore this file' 
+
+module DafnyModule1 {
+  method HelloWorld()
+  {
+    print "Hello World";
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/nestedmodule/SomeNestedModule.doo b/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/nestedmodule/SomeNestedModule.doo
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/nestedmodule/SomeNestedModule/SomeNestedModule-py.dtr b/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/nestedmodule/SomeNestedModule/SomeNestedModule-py.dtr
@@ -1,4 +1,4 @@
 file_format_version = "1.0"
-dafny_version = "4.7.0.0"
+dafny_version = "4.8.0.0"
 [options_by_module."Some.Nested.Module"]
 python-module-name = "SomeNestedModule"
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/nestedmodule/SomeTestModule.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/nestedmodule/SomeTestModule.dfy
@@ -1,6 +1,6 @@
 // RUN: pip3 install "%S"
-// RUN: %baredafny translate py --output "%S/SomeTestModule" --library="%S/SomeNestedModule.doo" --translation-record "%S/SomeNestedModule/SomeNestedModule-py.dtr" "%s"
-// RUN: python3 %S/SomeTestModule-py/ > %t
+// RUN: %baredafny translate py --output "%S/SomeTestModule" --library="%S/SomeNestedModule.doo" --translation-record "%S/SomeNestedModule/SomeNestedModule-py.dtr" "%s" --include-runtime
+// RUN: %S/python3 SomeTestModule-py/ > %t
 // RUN: %diff "%s.expect" "%t"
 module SomeTestModule {
 
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/nestedmodule/dafnysource/SomeNestedModule.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/nestedmodule/dafnysource/SomeNestedModule.dfy
@@ -0,0 +1,9 @@
+// This file is used to regenerate SomeNestedModule.doo
+// RUN: echo 'lit should ignore this file' 
+
+module Some.Nested.Module {
+  method HelloWorld()
+  {
+    print "Hello World";
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/singlemodule/dafnysource/helloworld.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/singlemodule/dafnysource/helloworld.dfy
@@ -1,8 +1,8 @@
-// RUN: %baredafny translate py  --python-module-name=PythonModule1 "%s" --output "%S/PythonModule1"
-// RUN: rm -rf "%S/PythonModule1"
-// RUN: mv "%S/PythonModule1-py/" "%S/PythonModule1"
+// RUN: %baredafny translate py  --python-module-name=PythonModule1 "%s" --output "%S/PythonModule1" --include-runtime
+// RUN: %exits-with -any %rm -rf "%S/PythonModule1"
+// RUN: %mv "%S/PythonModule1-py/" "%S/PythonModule1"
 // RUN: pip3 install "%S"
-// RUN: python3 %S/PythonModule1/ > %t
+// RUN: %S/python3 PythonModule1/ > %t
 // RUN: %diff "%s.expect" "%t"
 module DafnyModule1 {
     
diff --git a/Source/XUnitExtensions/Lit/ExitCommand.cs b/Source/XUnitExtensions/Lit/ExitCommand.cs
@@ -1,22 +1,32 @@
+using System.ComponentModel;
 using System.IO;
 using System.Threading.Tasks;
 
 namespace XUnitExtensions.Lit;
 
 
 public class ExitCommand : ILitCommand {
-  private readonly int expectedExitCode;
+  private readonly string expectedExitCode;
   private readonly ILitCommand operand;
 
-  public ExitCommand(int exitCode, ILitCommand operand) {
+  public ExitCommand(string exitCode, ILitCommand operand) {
     this.expectedExitCode = exitCode;
     this.operand = operand;
   }
 
   public async Task<int> Execute(TextReader inputReader,
     TextWriter outputWriter, TextWriter errorWriter) {
-    var exitCode = await operand.Execute(inputReader, outputWriter, errorWriter);
-    if (exitCode == expectedExitCode) {
+    var exitCode = 1;
+    try {
+      exitCode = await operand.Execute(inputReader, outputWriter, errorWriter);
+    } catch(Win32Exception) {
+      if (expectedExitCode == "-any") {
+      } else {
+        throw;
+      }
+    }
+
+    if (expectedExitCode == "-any" || exitCode.ToString() == expectedExitCode) {
       return 0;
     }
 
diff --git a/Source/XUnitExtensions/Lit/LitRunCommand.cs b/Source/XUnitExtensions/Lit/LitRunCommand.cs
@@ -18,7 +18,7 @@ private static ILitCommand ParseArguments(Token[] tokens, LitTestConfiguration c
         return new NotCommand(operand);
       }
       if (tokens[0].Value == "%exits-with") {
-        var ec = Int32.Parse(tokens[1].Value);
+        var ec = tokens[1].Value;
         var operand = ParseArguments(tokens[2..], config);
         return new ExitCommand(ec, operand);
       }
diff --git a/Source/XUnitExtensions/Lit/MvCommand.cs b/Source/XUnitExtensions/Lit/MvCommand.cs
@@ -0,0 +1,57 @@
+using System;
+using System.IO;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using Xunit;
+using Xunit.Abstractions;
+using Xunit.Sdk;
+
+namespace XUnitExtensions.Lit {
+  public class MvCommand : ILitCommand {
+
+    private readonly string fileOrFolder;
+    private readonly string destination;
+
+    private MvCommand(string fileOrFolder, string destination) {
+      this.fileOrFolder = fileOrFolder;
+      this.destination = destination;
+    }
+
+    public static ILitCommand Parse(string[] args) {
+      if (args.Length != 2) {
+        throw new ArgumentException($"Wrong number of arguments for mv, expected 2 but got {args.Length}");
+      }
+      var fileOrFolder = args[0];
+      var destination = args[1];
+
+      return new MvCommand(fileOrFolder, destination);
+    }
+
+    public async Task<int> Execute(TextReader inputReader,
+      TextWriter outputWriter, TextWriter errorWriter) {
+      if (File.Exists(fileOrFolder)) {
+        try {
+          File.Move(fileOrFolder, destination);
+        } catch (Exception e) {
+          await outputWriter.WriteLineAsync(e.ToString());
+          return 1;
+        }
+      } else if (Directory.Exists(fileOrFolder)) {
+        try {
+          Directory.Move(fileOrFolder, destination);
+        } catch (Exception e) {
+          await outputWriter.WriteLineAsync(e.ToString());
+          return 1;
+        }
+      } else {
+        throw new ArgumentException("File " + fileOrFolder + " not found");
+      }
+
+      return 0;
+    }
+
+    public override string ToString() {
+      return $"%mv {fileOrFolder} {destination}";
+    }
+  }
+}
diff --git a/Source/XUnitExtensions/Lit/RmCommand.cs b/Source/XUnitExtensions/Lit/RmCommand.cs
@@ -0,0 +1,86 @@
+using System;
+using System.IO;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using Xunit;
+using Xunit.Abstractions;
+using Xunit.Sdk;
+
+namespace XUnitExtensions.Lit {
+  public class RmCommand : ILitCommand {
+
+    private readonly string options;
+    private readonly string fileOrFolder;
+
+    private RmCommand(string options, string fileOrFolder) {
+      this.options = options;
+      this.fileOrFolder = fileOrFolder;
+    }
+
+    public static ILitCommand Parse(string[] args) {
+      if (args.Length != 1 && args.Length != 2) {
+        throw new ArgumentException($"Wrong number of arguments for rm, expected 1 or 2 but got {args.Length}");
+      }
+
+      string fileOrFolder;
+      string options;
+      if (args.Length == 2) {
+        options = args[0];
+        fileOrFolder = args[1];
+      } else {
+        options = "";
+        fileOrFolder = args[0];
+      }
+
+      return new RmCommand(options, fileOrFolder);
+    }
+    private static void RecursiveDelete(DirectoryInfo baseDir)
+    {
+      if (!baseDir.Exists) {
+        return;
+      }
+
+      foreach (var dir in baseDir.EnumerateDirectories()) {
+        RecursiveDelete(dir);
+      }
+      baseDir.Delete(true);
+    }
+    public async Task<int> Execute(TextReader inputReader,
+      TextWriter outputWriter, TextWriter errorWriter) {
+      if (File.Exists(fileOrFolder)) {
+        try {
+          File.Delete(fileOrFolder);
+        } catch (Exception e) {
+          await outputWriter.WriteLineAsync(e.ToString());
+          return 1;
+        }
+      } else if (Directory.Exists(fileOrFolder)) {
+        if (Directory.EnumerateFiles(fileOrFolder).Any()) {
+          if (options == "-rf") {
+            RecursiveDelete(new DirectoryInfo(fileOrFolder));
+          } else {
+            await outputWriter.WriteLineAsync("Directory is not empty. Please supply rm with -rf to force deletion");
+            return 1;
+          }
+        } else {
+          try {
+            Directory.Delete(fileOrFolder);
+          } catch (Exception e) {
+            await outputWriter.WriteLineAsync(e.ToString());
+            return 1;
+          }
+        }
+      } else {
+        await outputWriter.WriteLineAsync($"File or folder {fileOrFolder} not found");
+        return 1;
+      }
+
+      return 0;
+    }
+
+    public override string ToString() {
+      return $"%rm {(options != "" ? options + " " : "")}{fileOrFolder}";
+    }
+  }
+}
diff --git a/Source/XUnitExtensions/Lit/SedCommand.cs b/Source/XUnitExtensions/Lit/SedCommand.cs
@@ -22,7 +22,7 @@ private SedCommand(string regexp, string replaceBy, string file) {
 
     public static ILitCommand Parse(string[] args) {
       if (args.Length != 2) {
-        throw new ArgumentException($"Wrong number of arguments for sed: {args.Length}");
+        throw new ArgumentException($"Wrong number of arguments for sed, expected 2 but got {args.Length}");
       }
       var regexpReplace = args[0];
       var delimitCharacter = regexpReplace[1];
diff --git a/Source/XUnitExtensions/Lit/ShellLitCommand.cs b/Source/XUnitExtensions/Lit/ShellLitCommand.cs
@@ -23,6 +23,12 @@ public async Task<int> Execute(TextReader inputReader,
       TextWriter outputWriter, TextWriter errorWriter) {
       using var process = new Process();
 
+      if (shellCommand.Contains('/') && Path.GetFileName(shellCommand) is var command and "python3") {
+        var workingDir = Path.GetDirectoryName(shellCommand);
+        process.StartInfo.WorkingDirectory = workingDir;
+        shellCommand = command;
+      }
+
       process.StartInfo.FileName = shellCommand;
       foreach (var argument in Arguments) {
         process.StartInfo.ArgumentList.Add(argument);
