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 --- source/slangc/main.cpp | 65 ++++++++++++++++++++++---------------------------- 1 file changed, 29 insertions(+), 36 deletions(-) (limited to 'source/slangc/main.cpp') diff --git a/source/slangc/main.cpp b/source/slangc/main.cpp index ba83a9bdf..e65ce6aa0 100644 --- a/source/slangc/main.cpp +++ b/source/slangc/main.cpp @@ -1,23 +1,24 @@ -// main.cpp +// main.cpp #include "../../slang.h" SLANG_API void spSetCommandLineCompilerMode(SlangCompileRequest* request); #include "../core/slang-io.h" +#include "../core/slang-app-context.h" +#include "../core/slang-writer.h" using namespace Slang; #include -// Try to read an argument for a command-line option. - static void diagnosticCallback( char const* message, void* /*userData*/) { - fputs(message, stderr); - fflush(stderr); + auto stdError = AppContext::getStdError(); + stdError.put(message); + stdError.flush(); } #ifdef _WIN32 @@ -26,14 +27,10 @@ static void diagnosticCallback( #define MAIN main #endif -// Used to identify that compilation was the failure - with a unique 'internal' code -#define SLANG_E_INTERNAL_COMPILE_FAILED SLANG_MAKE_ERROR(SLANG_FACILITY_INTERNAL, 0x7fab) - -static SlangResult innerMain(int argc, char** argv) +SLANG_SHARED_LIBRARY_TOOL_API SlangResult innerMain(AppContext* appContext, SlangSession* session, int argc, const char*const* argv) { - // Parse any command-line options + AppContext::setSingleton(appContext); - SlangSession* session = spCreateSession(nullptr); SlangCompileRequest* compileRequest = spCreateCompileRequest(session); spSetDiagnosticCallback( @@ -43,6 +40,9 @@ static SlangResult innerMain(int argc, char** argv) spSetCommandLineCompilerMode(compileRequest); + // Do any app specific configuration + appContext->configureRequest(compileRequest); + char const* appName = "slangc"; if (argc > 0) appName = argv[0]; @@ -55,47 +55,40 @@ static SlangResult innerMain(int argc, char** argv) } } + SlangResult res = SLANG_OK; + #ifndef _DEBUG try #endif { - // Run the compiler (this will produce any diagnostics through - // our callback above). - if (SLANG_FAILED(spCompile(compileRequest))) - { - // If the compilation failed, then get out of here... - // Turn into an internal Result -> such that return code can be used to vary result to match previous behavior - return SLANG_E_INTERNAL_COMPILE_FAILED; - } - - // Now that we are done, clean up after ourselves - - spDestroyCompileRequest(compileRequest); - spDestroySession(session); + // Run the compiler (this will produce any diagnostics through SLANG_WRITER_TARGET_TYPE_DIAGNOSTIC). + res = spCompile(compileRequest); + // If the compilation failed, then get out of here... + // Turn into an internal Result -> such that return code can be used to vary result to match previous behavior + res = SLANG_FAILED(res) ? SLANG_E_INTERNAL_FAIL : res; } #ifndef _DEBUG catch (Exception & e) { - printf("internal compiler error: %S\n", e.Message.ToWString().begin()); - return SLANG_FAIL; + AppContext::getStdOut().print("internal compiler error: %S\n", e.Message.ToWString().begin()); + res = SLANG_FAIL; } #endif - return SLANG_OK; + + // Now that we are done, clean up after ourselves + spDestroyCompileRequest(compileRequest); + return res; } int MAIN(int argc, char** argv) { - SlangResult res = innerMain(argc, argv); - - if (SLANG_SUCCEEDED(res)) + SlangResult res; { - return 0; - } - else if (res == SLANG_E_INTERNAL_COMPILE_FAILED) - { - return -1; + SlangSession* session = spCreateSession(nullptr); + res = innerMain(AppContext::initDefault(), session, argc, argv); + spDestroySession(session); } - return 1; + return AppContext::getReturnCode(res); } #ifdef _WIN32 -- cgit v1.2.3