summaryrefslogtreecommitdiffstats
path: root/tools/slang-test
diff options
context:
space:
mode:
authorjsmall-nvidia <jsmall@nvidia.com>2019-01-07 09:14:01 -0500
committerGitHub <noreply@github.com>2019-01-07 09:14:01 -0500
commitd155eaa92d56a4ec00109d25c8c70fe12fb96c2e (patch)
tree55355d0aa67f99727f520ee3b210c27a647a12a9 /tools/slang-test
parentefa2c8f41aa5cd2c27990fd9b57ea0eff06976e7 (diff)
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.
Diffstat (limited to 'tools/slang-test')
-rw-r--r--tools/slang-test/slang-test-main.cpp (renamed from tools/slang-test/main.cpp)2
-rw-r--r--tools/slang-test/slang-test.vcxproj2
-rw-r--r--tools/slang-test/slang-test.vcxproj.filters6
3 files changed, 5 insertions, 5 deletions
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>