From 49ed6b60d662906f290578f802f80b0ead1a2b9d Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Wed, 12 Dec 2018 08:57:48 -0500 Subject: Running tests in slang-test process (#740) * First pass at having an interface to write text to that can be replaced. Simplifed and made more rigerous the interface used to write formatted strings. * Added AppContext to simplify setting up and parsing around of streams. * Added more simplified way to get the std error/out from AppContext. * Work in progress using dll for tools to speed up testing. * First pass at ISlangWriter interface. * Added support for writing VaArgs. Added NullWriter. * Use ISlangWriter for output. * Use ISlangWriter for output - replacing OutputCallback. Make IRDump go to ISlangWriter * SlangWriterTargetType -> SlangWriterChannel Improvements around AppContext * Shared library working with slang-reflection-test. * Dll testing working for render-test. * Include va_list definintion from header. * Fix errors from clang. * Fix typo for linux. * Added -usexes option * Fix typo. * Fix arguments problem on linux. * Fix typo for linux. * Add windows tool shared library projects. * Fix warning from x86 win build. Fix signed warning from slang-test/main.cpp * First attempt at getting premake to work on travis, and run tests. * Try moving build out into script. * Invoke bash scripts so they don't have to be executable. * Drive configuration/tests from env parameters set by travis * Try using source to run travis tests. * Remove the build.linux directory - but doing so will overwrite Makefile. * Made -fno-delete-null-pointer-checks gcc only. * Try to fix warning from -fno-delete-null-pointer-checks * Turn of warnings for unknown switches. * Try to make premake choose the correct tooling. * Disabled missing braces warning. * Disable -Wundefined-var-template on clang. * -Wunused-function disabled for clang. * Fix typo due to SlangBool. * Remove this nullptr tests. * "-Wno-unused-private-field" for clang. * Added "-Wno-undefined-bool-conversion" * Add DominatorList::end fix. * Split scripts into travis_build.sh travis_test.sh * Fix gcc/clang template pre-declaration issue around QualType. * Fix premake to build such that pthread correctly links with slang-glslang --- tools/slang-reflection-test/main.cpp | 28 ++-- .../slang-reflection-test-shared-library.vcxproj | 182 +++++++++++++++++++++ ...-reflection-test-shared-library.vcxproj.filters | 13 ++ .../slang-reflection-test.vcxproj | 3 + 4 files changed, 215 insertions(+), 11 deletions(-) create mode 100644 tools/slang-reflection-test/slang-reflection-test-shared-library.vcxproj create mode 100644 tools/slang-reflection-test/slang-reflection-test-shared-library.vcxproj.filters (limited to 'tools/slang-reflection-test') diff --git a/tools/slang-reflection-test/main.cpp b/tools/slang-reflection-test/main.cpp index 872d2ff3a..41a21eee8 100644 --- a/tools/slang-reflection-test/main.cpp +++ b/tools/slang-reflection-test/main.cpp @@ -8,6 +8,8 @@ #include #include +#include "../../source/core/slang-app-context.h" + struct PrettyWriter { bool startOfLine = true; @@ -16,7 +18,7 @@ struct PrettyWriter static void writeRaw(PrettyWriter& writer, char const* begin, char const* end) { - fprintf(stdout, "%.*s", int(end - begin), begin); + Slang::AppContext::getStdOut().print("%.*s", int(end - begin), begin); } static void writeRaw(PrettyWriter& writer, char const* begin) @@ -27,7 +29,7 @@ static void writeRaw(PrettyWriter& writer, char const* begin) static void writeRawChar(PrettyWriter& writer, int c) { char buffer[] = { (char) c, 0 }; - writeRaw(writer, buffer); + writeRaw(writer, buffer, buffer + 1); } static void adjust(PrettyWriter& writer) @@ -77,7 +79,7 @@ static void write(PrettyWriter& writer, char const* text) static void write(PrettyWriter& writer, SlangUInt val) { adjust(writer); - fprintf(stdout, "%llu", (unsigned long long)val); + Slang::AppContext::getStdOut().print("%llu", (unsigned long long)val); } static void emitReflectionVarInfoJSON(PrettyWriter& writer, slang::VariableReflection* var); @@ -881,6 +883,7 @@ void emitReflectionJSON( auto programReflection = (slang::ShaderReflection*) reflection; PrettyWriter writer; + emitReflectionJSON(writer, programReflection); } @@ -889,18 +892,19 @@ static SlangResult maybeDumpDiagnostic(SlangResult res, SlangCompileRequest* req const char* diagnostic; if (SLANG_FAILED(res) && (diagnostic = spGetDiagnosticOutput(request))) { - fputs(diagnostic, stderr); + Slang::AppContext::getStdError().put(diagnostic); } return res; } -static SlangResult innerMain(int argc, char*const*argv) +SLANG_SHARED_LIBRARY_TOOL_API SlangResult innerMain(Slang::AppContext* appContext, SlangSession* session, int argc, const char*const* argv) { - // Parse any command-line options - - SlangSession* session = spCreateSession(nullptr); + Slang::AppContext::setSingleton(appContext); + SlangCompileRequest* request = spCreateCompileRequest(session); + appContext->configureRequest(request); + char const* appName = "slang-reflection-test"; if (argc > 0) appName = argv[0]; @@ -914,8 +918,7 @@ static SlangResult innerMain(int argc, char*const*argv) emitReflectionJSON(reflection); spDestroyCompileRequest(request); - spDestroySession(session); - + return SLANG_OK; } @@ -923,6 +926,9 @@ int main( int argc, char** argv) { - SlangResult res = innerMain(argc, argv); + SlangSession* session = spCreateSession(nullptr); + SlangResult res = innerMain(Slang::AppContext::initDefault(), session, argc, argv); + spDestroySession(session); + return SLANG_FAILED(res) ? 1 : 0; } diff --git a/tools/slang-reflection-test/slang-reflection-test-shared-library.vcxproj b/tools/slang-reflection-test/slang-reflection-test-shared-library.vcxproj new file mode 100644 index 000000000..48d08b94e --- /dev/null +++ b/tools/slang-reflection-test/slang-reflection-test-shared-library.vcxproj @@ -0,0 +1,182 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {C5ACCA6E-C04D-4B36-8516-3752B3C13C2F} + true + Win32Proj + slang-reflection-test-shared-library + + + + DynamicLibrary + true + Unicode + v140 + + + DynamicLibrary + true + Unicode + v140 + + + DynamicLibrary + false + Unicode + v140 + + + DynamicLibrary + false + Unicode + v140 + + + + + + + + + + + + + + + + + + + true + ..\..\bin\windows-x86\debug\ + ..\..\intermediate\windows-x86\debug\slang-reflection-test-shared-library\ + slang-reflection-test-shared-library + .dll + + + true + ..\..\bin\windows-x64\debug\ + ..\..\intermediate\windows-x64\debug\slang-reflection-test-shared-library\ + slang-reflection-test-shared-library + .dll + + + false + ..\..\bin\windows-x86\release\ + ..\..\intermediate\windows-x86\release\slang-reflection-test-shared-library\ + slang-reflection-test-shared-library + .dll + + + false + ..\..\bin\windows-x64\release\ + ..\..\intermediate\windows-x64\release\slang-reflection-test-shared-library\ + slang-reflection-test-shared-library + .dll + + + + NotUsing + Level3 + _DEBUG;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) + ..\..;%(AdditionalIncludeDirectories) + EditAndContinue + Disabled + MultiThreadedDebug + + + Windows + true + ..\..\bin\windows-x86\debug\slang-reflection-test-shared-library.lib + + + + + NotUsing + Level3 + _DEBUG;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) + ..\..;%(AdditionalIncludeDirectories) + EditAndContinue + Disabled + MultiThreadedDebug + + + Windows + true + ..\..\bin\windows-x64\debug\slang-reflection-test-shared-library.lib + + + + + NotUsing + Level3 + NDEBUG;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) + ..\..;%(AdditionalIncludeDirectories) + Full + true + true + false + true + MultiThreaded + + + Windows + true + true + ..\..\bin\windows-x86\release\slang-reflection-test-shared-library.lib + + + + + NotUsing + Level3 + NDEBUG;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) + ..\..;%(AdditionalIncludeDirectories) + Full + true + true + false + true + MultiThreaded + + + Windows + true + true + ..\..\bin\windows-x64\release\slang-reflection-test-shared-library.lib + + + + + + + + {F9BE7957-8399-899E-0C49-E714FDDD4B65} + + + {DB00DA62-0533-4AFD-B59F-A67D5B3A0808} + + + + + + \ No newline at end of file diff --git a/tools/slang-reflection-test/slang-reflection-test-shared-library.vcxproj.filters b/tools/slang-reflection-test/slang-reflection-test-shared-library.vcxproj.filters new file mode 100644 index 000000000..e9ae1c092 --- /dev/null +++ b/tools/slang-reflection-test/slang-reflection-test-shared-library.vcxproj.filters @@ -0,0 +1,13 @@ + + + + + {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} + + + + + Source Files + + + \ No newline at end of file diff --git a/tools/slang-reflection-test/slang-reflection-test.vcxproj b/tools/slang-reflection-test/slang-reflection-test.vcxproj index 78e562401..8a40290e6 100644 --- a/tools/slang-reflection-test/slang-reflection-test.vcxproj +++ b/tools/slang-reflection-test/slang-reflection-test.vcxproj @@ -168,6 +168,9 @@ {DB00DA62-0533-4AFD-B59F-A67D5B3A0808} + + {F9BE7957-8399-899E-0C49-E714FDDD4B65} + -- cgit v1.2.3