New Sputnik 'negative' metadata that included exception type was causing problems for SputnikConverter.

Took the easy fix and split the metadata into two: 'negative' and 'errortype'.

11 files changed, 9 insertions, 8 deletions

diff --git a/tools/SputnikConverter/ES5TestCase.cs b/tools/SputnikConverter/ES5TestCase.cs
index 4d1116a14..db39133a7 100644
--- a/tools/SputnikConverter/ES5TestCase.cs
+++ b/tools/SputnikConverter/ES5TestCase.cs
@@ -69,7 +69,7 @@ namespace Microsoft.Sputnik.Interop.ParserEngine
                 Console.WriteLine();

             }

 

-            string[] args = { script.Header, script.id, script.path, InsertStringEscapes(script.assertion), InsertStringEscapes(script.description), script.ReplicationCode, body, preCondition, script.InitialComment };

+            string[] args = { script.Header, script.id, script.path.Replace("\\", "/"), InsertStringEscapes(script.assertion), InsertStringEscapes(script.description), script.ReplicationCode, body, preCondition, script.InitialComment };

             destFullPath = Path.Combine(destDir, string.Format(@"{0}.js", script.id));

 

             try

diff --git a/tools/SputnikConverter/Microsoft.Sputnik.Interop.ParserEngine.csproj.user b/tools/SputnikConverter/Microsoft.Sputnik.Interop.ParserEngine.csproj.user
index 18af890b4..83cf0b36a 100644
--- a/tools/SputnikConverter/Microsoft.Sputnik.Interop.ParserEngine.csproj.user
+++ b/tools/SputnikConverter/Microsoft.Sputnik.Interop.ParserEngine.csproj.user
@@ -14,6 +14,6 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">

     <StartWorkingDirectory>

     </StartWorkingDirectory>

-    <StartArguments>E:\test262-msft\test\suite\sputnik\conformance E:\test262-msft\test\suite\sputnik_new01</StartArguments>

+    <StartArguments>G:\262\test262\test\suite\sputnik\conformance G:\262\test262\test\suite\sputnik_new01</StartArguments>

   </PropertyGroup>

 </Project>
\ No newline at end of file
diff --git a/tools/SputnikConverter/Program.cs b/tools/SputnikConverter/Program.cs
index e298f5353..3414375bd 100644
--- a/tools/SputnikConverter/Program.cs
+++ b/tools/SputnikConverter/Program.cs
@@ -15,6 +15,7 @@ namespace Microsoft.Sputnik.Interop.ParserEngine
 

             if (args == null || args.Length < 2)

             {

+                System.Console.WriteLine("You must specify the source directory and the destination directory!");

                 return;

             }

             source = args[0];

diff --git a/tools/SputnikConverter/bin/Debug/Microsoft.Sputnik.Interop.ParserEngine.exe b/tools/SputnikConverter/bin/Debug/Microsoft.Sputnik.Interop.ParserEngine.exe
index bd47f0985..3963221b3 100644
--- a/tools/SputnikConverter/bin/Debug/Microsoft.Sputnik.Interop.ParserEngine.exe
+++ b/tools/SputnikConverter/bin/Debug/Microsoft.Sputnik.Interop.ParserEngine.exe
diff --git a/tools/SputnikConverter/bin/Debug/Microsoft.Sputnik.Interop.ParserEngine.pdb b/tools/SputnikConverter/bin/Debug/Microsoft.Sputnik.Interop.ParserEngine.pdb
index 002465ffe..8fe7baed3 100644
--- a/tools/SputnikConverter/bin/Debug/Microsoft.Sputnik.Interop.ParserEngine.pdb
+++ b/tools/SputnikConverter/bin/Debug/Microsoft.Sputnik.Interop.ParserEngine.pdb
diff --git a/tools/SputnikConverter/bin/Debug/testNegativePrereqTemplate.js b/tools/SputnikConverter/bin/Debug/testNegativePrereqTemplate.js
index 1a59a8403..ae1dbfe9b 100644
--- a/tools/SputnikConverter/bin/Debug/testNegativePrereqTemplate.js
+++ b/tools/SputnikConverter/bin/Debug/testNegativePrereqTemplate.js
@@ -4,7 +4,7 @@
 ES5Harness.registerTest( {{

 id: "{1}",

 

-path: "{2}",

+path: "TestCases/{2}",

 

 description: "{4}",

 

diff --git a/tools/SputnikConverter/bin/Debug/testPrereqTemplate.js b/tools/SputnikConverter/bin/Debug/testPrereqTemplate.js
index 62f170bf3..0faf2536c 100644
--- a/tools/SputnikConverter/bin/Debug/testPrereqTemplate.js
+++ b/tools/SputnikConverter/bin/Debug/testPrereqTemplate.js
@@ -4,7 +4,7 @@
 ES5Harness.registerTest( {{

 id: "{1}",

 

-path: "{2}",

+path: "TestCases/{2}",

 

 assertion: "{3}",

 

diff --git a/tools/SputnikConverter/bin/Debug/testTemplate.js b/tools/SputnikConverter/bin/Debug/testTemplate.js
index e79eff4e3..7026d6f4e 100644
--- a/tools/SputnikConverter/bin/Debug/testTemplate.js
+++ b/tools/SputnikConverter/bin/Debug/testTemplate.js
@@ -4,7 +4,7 @@
 ES5Harness.registerTest( {{

 id: "{1}",

 

-path: "{2}",

+path: "TestCases/{2}",

 

 assertion: "{3}",

 

diff --git a/tools/SputnikConverter/testNegativePrereqTemplate.js b/tools/SputnikConverter/testNegativePrereqTemplate.js
index 1a59a8403..ae1dbfe9b 100644
--- a/tools/SputnikConverter/testNegativePrereqTemplate.js
+++ b/tools/SputnikConverter/testNegativePrereqTemplate.js
@@ -4,7 +4,7 @@
 ES5Harness.registerTest( {{

 id: "{1}",

 

-path: "{2}",

+path: "TestCases/{2}",

 

 description: "{4}",

 

diff --git a/tools/SputnikConverter/testPrereqTemplate.js b/tools/SputnikConverter/testPrereqTemplate.js
index 62f170bf3..0faf2536c 100644
--- a/tools/SputnikConverter/testPrereqTemplate.js
+++ b/tools/SputnikConverter/testPrereqTemplate.js
@@ -4,7 +4,7 @@
 ES5Harness.registerTest( {{

 id: "{1}",

 

-path: "{2}",

+path: "TestCases/{2}",

 

 assertion: "{3}",

 

diff --git a/tools/SputnikConverter/testTemplate.js b/tools/SputnikConverter/testTemplate.js
index e79eff4e3..7026d6f4e 100644
--- a/tools/SputnikConverter/testTemplate.js
+++ b/tools/SputnikConverter/testTemplate.js
@@ -4,7 +4,7 @@
 ES5Harness.registerTest( {{

 id: "{1}",

 

-path: "{2}",

+path: "TestCases/{2}",

 

 assertion: "{3}",