Feature/unique tool source names (#766)

* Remove AppContext. Use StdChannels to hold writers, and TestToolUtil to hold test tool specific functionality.

* StdChannels -> StdWriters

* getStdOut -> getOut, getStdError -> getError

* Renamed main.cpp files of tools to try and stop visual studio getting confused between files - such that clicking on an error takes editor to the right location.

9 files changed, 13 insertions, 13 deletions

diff --git a/tools/render-test/main.cpp b/tools/render-test/render-test-main.cpp
index 69874ac04..7cf303631 100644
--- a/tools/render-test/main.cpp
+++ b/tools/render-test/render-test-main.cpp
@@ -1,4 +1,4 @@
-// main.cpp
+// render-test-main.cpp
 
 #include "options.h"
 #include "render.h"
diff --git a/tools/render-test/render-test-tool.vcxproj b/tools/render-test/render-test-tool.vcxproj
index 811ffa56d..dea8627e3 100644
--- a/tools/render-test/render-test-tool.vcxproj
+++ b/tools/render-test/render-test-tool.vcxproj
@@ -186,9 +186,9 @@
     <ClInclude Include="slang-support.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="main.cpp" />
     <ClCompile Include="options.cpp" />
     <ClCompile Include="png-serialize-util.cpp" />
+    <ClCompile Include="render-test-main.cpp" />
     <ClCompile Include="shader-input-layout.cpp" />
     <ClCompile Include="shader-renderer-util.cpp" />
     <ClCompile Include="slang-support.cpp" />
diff --git a/tools/render-test/render-test-tool.vcxproj.filters b/tools/render-test/render-test-tool.vcxproj.filters
index ff3d52a7e..39197c7e9 100644
--- a/tools/render-test/render-test-tool.vcxproj.filters
+++ b/tools/render-test/render-test-tool.vcxproj.filters
@@ -26,15 +26,15 @@
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="main.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="options.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="png-serialize-util.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="render-test-main.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="shader-input-layout.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/tools/slang-reflection-test/main.cpp b/tools/slang-reflection-test/slang-reflection-test-main.cpp
index 04818dfdf..071a15cd4 100644
--- a/tools/slang-reflection-test/main.cpp
+++ b/tools/slang-reflection-test/slang-reflection-test-main.cpp
@@ -1,4 +1,4 @@
-// main.cpp
+// slang-reflection-test-main.cpp
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/tools/slang-reflection-test/slang-reflection-test-tool.vcxproj b/tools/slang-reflection-test/slang-reflection-test-tool.vcxproj
index 77efa33f0..51018db26 100644
--- a/tools/slang-reflection-test/slang-reflection-test-tool.vcxproj
+++ b/tools/slang-reflection-test/slang-reflection-test-tool.vcxproj
@@ -166,7 +166,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="main.cpp" />
+    <ClCompile Include="slang-reflection-test-main.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\source\core\core.vcxproj">
diff --git a/tools/slang-reflection-test/slang-reflection-test-tool.vcxproj.filters b/tools/slang-reflection-test/slang-reflection-test-tool.vcxproj.filters
index e9ae1c092..2e5dbea25 100644
--- a/tools/slang-reflection-test/slang-reflection-test-tool.vcxproj.filters
+++ b/tools/slang-reflection-test/slang-reflection-test-tool.vcxproj.filters
@@ -6,7 +6,7 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="main.cpp">
+    <ClCompile Include="slang-reflection-test-main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/tools/slang-test/main.cpp b/tools/slang-test/slang-test-main.cpp
index 102b0b961..c0e5bd95b 100644
--- a/tools/slang-test/main.cpp
+++ b/tools/slang-test/slang-test-main.cpp
@@ -1,4 +1,4 @@
-// main.cpp
+// slang-test-main.cpp
 
 #include "../../source/core/slang-io.h"
 #include "../../source/core/token-reader.h"
diff --git a/tools/slang-test/slang-test.vcxproj b/tools/slang-test/slang-test.vcxproj
index cbd00ad0e..520ee1759 100644
--- a/tools/slang-test/slang-test.vcxproj
+++ b/tools/slang-test/slang-test.vcxproj
@@ -170,10 +170,10 @@
     <ClInclude Include="test-reporter.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="main.cpp" />
     <ClCompile Include="options.cpp" />
     <ClCompile Include="os.cpp" />
     <ClCompile Include="render-api-util.cpp" />
+    <ClCompile Include="slang-test-main.cpp" />
     <ClCompile Include="slangc-tool.cpp" />
     <ClCompile Include="test-context.cpp" />
     <ClCompile Include="test-reporter.cpp" />
diff --git a/tools/slang-test/slang-test.vcxproj.filters b/tools/slang-test/slang-test.vcxproj.filters
index 6c1bdf941..be03d5273 100644
--- a/tools/slang-test/slang-test.vcxproj.filters
+++ b/tools/slang-test/slang-test.vcxproj.filters
@@ -29,9 +29,6 @@
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="main.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="options.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -41,6 +38,9 @@
     <ClCompile Include="render-api-util.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="slang-test-main.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="slangc-tool.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>