diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/render-test/render-test.vcxproj | 4 | ||||
| -rw-r--r-- | tools/slang-test/main.cpp | 15 | ||||
| -rw-r--r-- | tools/slang-test/os.cpp | 2 | ||||
| -rw-r--r-- | tools/slang-test/slang-test.vcxproj | 12 |
4 files changed, 20 insertions, 13 deletions
diff --git a/tools/render-test/render-test.vcxproj b/tools/render-test/render-test.vcxproj index 0b0f6b05e..a175d3973 100644 --- a/tools/render-test/render-test.vcxproj +++ b/tools/render-test/render-test.vcxproj @@ -98,6 +98,7 @@ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>../../source/</AdditionalIncludeDirectories> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -113,6 +114,7 @@ <PreprocessorDefinitions>_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>../../source/</AdditionalIncludeDirectories> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -130,6 +132,7 @@ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>../../source/</AdditionalIncludeDirectories> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -149,6 +152,7 @@ <PreprocessorDefinitions>NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>../../source/</AdditionalIncludeDirectories> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <Link> <SubSystem>Console</SubSystem> diff --git a/tools/slang-test/main.cpp b/tools/slang-test/main.cpp index cb1730c6e..292b98137 100644 --- a/tools/slang-test/main.cpp +++ b/tools/slang-test/main.cpp @@ -95,8 +95,8 @@ void parseOptions(int* argc, char** argv) { while(argCursor != argEnd) { - char const* arg = *argCursor++; - *writeCursor++ = arg; + char const* nxtArg = *argCursor++; + *writeCursor++ = nxtArg; } break; } @@ -1387,7 +1387,7 @@ TestResult runHLSLAndGLSLComparisonTest(TestInput& input) return runHLSLRenderComparisonTestImpl(input, "-hlsl-rewrite", "-glsl-rewrite"); } -TestResult skipTest(TestInput& input) +TestResult skipTest(TestInput& /*input*/) { return kTestResult_Ignored; } @@ -1579,7 +1579,7 @@ bool testCategoryMatches( } bool testPassesCategoryMask( - TestContext* context, + TestContext* /*context*/, TestOptions const& test) { // Don't include a test we should filter out @@ -1650,7 +1650,7 @@ void runTestsOnFile( static bool endsWithAllowedExtension( - TestContext* context, + TestContext* /*context*/, String filePath) { char const* allowedExtensions[] = { @@ -1723,12 +1723,11 @@ int main( auto quickTestCategory = addTestCategory("quick", fullTestCategory); - auto smokeTestCategory = addTestCategory("smoke", quickTestCategory); + /*auto smokeTestCategory = */addTestCategory("smoke", quickTestCategory); auto renderTestCategory = addTestCategory("render", fullTestCategory); - auto computeTestCategory = addTestCategory("compute", fullTestCategory); - + /*auto computeTestCategory = */addTestCategory("compute", fullTestCategory); // An un-categorized test will always belong to the `full` category defaultTestCategory = fullTestCategory; diff --git a/tools/slang-test/os.cpp b/tools/slang-test/os.cpp index 4d5a49a9f..8cb49248c 100644 --- a/tools/slang-test/os.cpp +++ b/tools/slang-test/os.cpp @@ -185,7 +185,7 @@ static DWORD WINAPI osReaderThreadProc(LPVOID threadParam) break; } - *writeCursor++ = c; + *writeCursor++ = (char)c; } bytesRead = (DWORD)(writeCursor - buffer); diff --git a/tools/slang-test/slang-test.vcxproj b/tools/slang-test/slang-test.vcxproj index 27453391c..70b35e93b 100644 --- a/tools/slang-test/slang-test.vcxproj +++ b/tools/slang-test/slang-test.vcxproj @@ -93,10 +93,11 @@ <ClCompile> <PrecompiledHeader> </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> + <WarningLevel>Level4</WarningLevel> <Optimization>Disabled</Optimization> <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -107,10 +108,11 @@ <ClCompile> <PrecompiledHeader> </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> + <WarningLevel>Level4</WarningLevel> <Optimization>Disabled</Optimization> <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -119,7 +121,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <WarningLevel>Level3</WarningLevel> + <WarningLevel>Level4</WarningLevel> <PrecompiledHeader> </PrecompiledHeader> <Optimization>MaxSpeed</Optimization> @@ -127,6 +129,7 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -137,7 +140,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> - <WarningLevel>Level3</WarningLevel> + <WarningLevel>Level4</WarningLevel> <PrecompiledHeader> </PrecompiledHeader> <Optimization>MaxSpeed</Optimization> @@ -145,6 +148,7 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <Link> <SubSystem>Console</SubSystem> |
