Working on new test utility. Fix some bugs.

artelk · Sep 4, 2012 · cda89d7 · cda89d7
1 parent b751ad6
commit cda89d7
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/snippets/Nemerle.Test/Nemerle.Compiler.Test/HostedNcc.n b/snippets/Nemerle.Test/Nemerle.Compiler.Test/HostedNcc.n
@@ -18,7 +18,7 @@ namespace Nemerle.Compiler.Test
   /// </summary>
   internal sealed class HostedNcc : Ncc
   {
-    public this([NotNull] nccArguments : list[string])
+    public this([NotNull] nccArguments : list[string], verbosity : int)
     {
       _nccArguments = nccArguments;
     }
@@ -49,7 +49,8 @@ namespace Nemerle.Compiler.Test
         | _ is FileNotFoundException => exitCode = 1
         | _ is AssemblyFindException => exitCode = 3
         | e =>
-          testOutputWriter.WriteLine(NccTestMessageType.Debug, e.ToString());
+          when(_verbosity > 0)
+            testOutputWriter.WriteLine(NccTestMessageType.Debug, e.ToString());
           exitCode = 2
       }
       when (Message.SeenError && exitCode != 3)
@@ -59,5 +60,6 @@ namespace Nemerle.Compiler.Test
     }
 
     private _nccArguments : list[string];
+    private _verbosity : int;
   }
 }
diff --git a/snippets/Nemerle.Test/Nemerle.Compiler.Test/Main.n b/snippets/Nemerle.Test/Nemerle.Compiler.Test/Main.n
@@ -7,6 +7,7 @@ using Nemerle.Test.Framework;
 using Nemerle.Test.Framework.Utils;
 
 using System;
+using System.IO;
 using System.Collections.Generic;
 using System.Console;
 using System.Linq;
@@ -144,7 +145,7 @@ internal module Program
     def ncc = match(externalNcc)
     {
       | Some(fileName) => ExternalNcc(fileName, nccArguments.ToNList(), processStartFactory)
-      | None           => HostedNcc(nccArguments.ToNList())
+      | None           => HostedNcc(nccArguments.ToNList(), verbosity)
     };
     def verifier = match(externalVerifier)
     {
@@ -170,7 +171,7 @@ internal module Program
         ThreadRunner(listener, 20 * 1024 * 1024 * if (IntPtr.Size == 8) 4 else 1)
       else
         Runner(listener);
-    def tests = FileSearcher.Search(testFiles).Select(NccTest(_, outputDirectory, outputWriter, ncc, referencies, verifier, processStartFactory, verbosity));
+    def tests = FileSearcher.Search(testFiles, SearchOption.TopDirectoryOnly).Select(NccTest(_, outputDirectory, outputWriter, ncc, referencies, verifier, processStartFactory, verbosity));
     runner.Run(tests);
     mainExecutionListener.GetExitCode()
   }

diff --git a/snippets/Nemerle.Test/Nemerle.Compiler.Test/NccTest.n b/snippets/Nemerle.Test/Nemerle.Compiler.Test/NccTest.n
@@ -173,7 +173,8 @@ namespace Nemerle.Compiler.Test
       when(_verbosity > 0)
         _log.WriteLine(NccTestMessageType.Debug, $"RUN: ..$compilationOptions on $_filePath");
 
-      _compiler.Compile(compilationOptions.ToNList(), [_filePath], _log)
+      def normalizedFilePath = _filePath.Replace('\\', '/');
+      _compiler.Compile(compilationOptions.ToNList(), [normalizedFilePath], _log)
     }
 
     private validateMessages(description : NccTestDescription, compilationResult : NccResult) : void

diff --git a/snippets/Nemerle.Test/Nemerle.Compiler.Test/Nemerle.Compiler.Test.nproj b/snippets/Nemerle.Test/Nemerle.Compiler.Test/Nemerle.Compiler.Test.nproj
@@ -27,7 +27,7 @@
     <WarningLevel>4</WarningLevel>
     <StartProgram />
     <WorkingDirectory />
-    <CmdArgs>-p:-nowarn:10003 -output:. C:\!Proj\nemerle\ncc\testsuite\positive\*.n</CmdArgs>
+    <CmdArgs>"-p:-nowarn:10003 -def:RUNTIME_MS;NET_4_0" -output:. C:\!Proj\nemerle\ncc\testsuite\positive\resource.n</CmdArgs>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugSymbols>false</DebugSymbols>

diff --git a/snippets/Nemerle.Test/Nemerle.Test.Framework/Utils/FileSearcher.n b/snippets/Nemerle.Test/Nemerle.Test.Framework/Utils/FileSearcher.n
@@ -13,7 +13,7 @@ namespace Nemerle.Test.Framework.Utils
 {
   public module FileSearcher
   {
-    public Search([NotNull] fileMasks : IEnumerable[string]) : array[string]
+    public Search([NotNull] fileMasks : IEnumerable[string], searchOption: SearchOption = SearchOption.AllDirectories) : array[string]
     {
       def filePaths = List();
       foreach(fileMask in fileMasks)
@@ -27,7 +27,7 @@ namespace Nemerle.Test.Framework.Utils
         def maskFileName = Path.GetFileName(fileMask);
         def fileNames =
           if(fileMask.IndexOfAny(array['*', '?']) >= 0)
-            Directory.GetFiles(maskFileDir, maskFileName, SearchOption.AllDirectories)
+            Directory.GetFiles(maskFileDir, maskFileName, searchOption)
           else
             Directory.GetFiles(maskFileDir, maskFileName);
         filePaths.AddRange(fileNames);