summaryrefslogtreecommitdiffstats
path: root/tools/slang-test/os.cpp
diff options
context:
space:
mode:
authorjsmall-nvidia <jsmall@nvidia.com>2018-12-12 08:57:48 -0500
committerGitHub <noreply@github.com>2018-12-12 08:57:48 -0500
commit49ed6b60d662906f290578f802f80b0ead1a2b9d (patch)
treee47050f6508a4b3a4d38b756e9b3c53e0d159507 /tools/slang-test/os.cpp
parent62d3e387774255be4d507cca045ac97dabac9970 (diff)
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
Diffstat (limited to 'tools/slang-test/os.cpp')
-rw-r--r--tools/slang-test/os.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/tools/slang-test/os.cpp b/tools/slang-test/os.cpp
index 8cb49248c..9ecf50557 100644
--- a/tools/slang-test/os.cpp
+++ b/tools/slang-test/os.cpp
@@ -222,6 +222,8 @@ void OSProcessSpawner::pushArgument(
// TODO(tfoley): handle cases where arguments need some escaping
commandLine_.Append(" ");
commandLine_.Append(argument);
+
+ argumentList_.Add(argument);
}
Slang::String OSProcessSpawner::getCommandLine()
@@ -480,7 +482,7 @@ void OSProcessSpawner::pushExecutableName(
Slang::String executableName)
{
executableName_ = executableName;
- pushArgument(executableName);
+ arguments_.Add(executableName);
isExecutablePath_ = false;
}
@@ -488,7 +490,7 @@ void OSProcessSpawner::pushExecutablePath(
Slang::String executablePath)
{
executableName_ = executablePath;
- pushArgument(executablePath);
+ arguments_.Add(executablePath);
isExecutablePath_ = true;
}
@@ -496,6 +498,7 @@ void OSProcessSpawner::pushArgument(
Slang::String argument)
{
arguments_.Add(argument);
+ argumentList_.Add(argument);
}
Slang::String OSProcessSpawner::getCommandLine()
@@ -507,7 +510,6 @@ Slang::String OSProcessSpawner::getCommandLine()
{
if(ii != 0) sb << " ";
sb << arguments_[ii];
-
}
return sb.ProduceString();
}