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/core/slang-app-context.h | 60 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 source/core/slang-app-context.h (limited to 'source/core/slang-app-context.h') diff --git a/source/core/slang-app-context.h b/source/core/slang-app-context.h new file mode 100644 index 000000000..9f1eb306c --- /dev/null +++ b/source/core/slang-app-context.h @@ -0,0 +1,60 @@ +#ifndef SLANG_APP_CONTEXT_H +#define SLANG_APP_CONTEXT_H + +#include "slang-writer.h" +#include "../../slang-com-ptr.h" + +namespace Slang +{ + +#ifdef SLANG_SHARED_LIBRARY_TOOL +# define SLANG_SHARED_LIBRARY_TOOL_API SLANG_EXTERN_C SLANG_DLL_EXPORT +#else +# define SLANG_SHARED_LIBRARY_TOOL_API +#endif + +/* A structure to hold general state shared across an application */ +class AppContext +{ +public: + + ISlangWriter * getWriter(SlangWriterChannel chan) const { return m_writers[chan]; } + void setWriter(SlangWriterChannel chan, ISlangWriter* writer) { m_writers[chan] = writer; } + + /// Make modifications to the request + void configureRequest(SlangCompileRequest* request); + + void setRequestWriters(SlangCompileRequest* request); + + void setReplaceWriterFlagsAll() { setReplaceWriterFlags((1 << SLANG_WRITER_CHANNEL_COUNT_OF) - 1); } + void setReplaceWriterFlags(int flags) { m_replaceWriterFlags = flags; } + int getReplaceWriterFlags() const { return m_replaceWriterFlags; } + + /// Ctor + AppContext() : m_replaceWriterFlags(0) {} + + /// Initialize a default context + static AppContext* initDefault(); + + static AppContext* getDefault(); + + static AppContext* getSingleton() { return s_singleton; } + static void setSingleton(AppContext* context) { s_singleton = context; } + + static WriterHelper getStdError() { return getSingleton()->getWriter(SLANG_WRITER_CHANNEL_STD_ERROR); } + static WriterHelper getStdOut() { return getSingleton()->getWriter(SLANG_WRITER_CHANNEL_STD_OUTPUT); } + static WriterHelper getDiagnostic() { return getSingleton()->getWriter(SLANG_WRITER_CHANNEL_DIAGNOSTIC); } + + static int getReturnCode(SlangResult res); + +protected: + + ComPtr m_writers[SLANG_WRITER_CHANNEL_COUNT_OF]; + int m_replaceWriterFlags; ///< Bit for each writer + + static AppContext* s_singleton; +}; + +} + +#endif -- cgit v1.2.3