diff options
| author | jsmall-nvidia <jsmall@nvidia.com> | 2019-06-13 15:03:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-13 15:03:01 -0400 |
| commit | 84c42000cbe92e7a4d1fcc3740ef6c41cdc5ee0b (patch) | |
| tree | 4fcb0bb6de6122e92de95042b90cfe7d5e3956f4 /tools | |
| parent | 503721047731e8f6566bc51d6eadc7d24161c129 (diff) | |
Runtime C++ compiling and testing on Unix-like targets (#981)
* Work in progress to be able to invoke VS from within code.
* First pass at windows version of refactor of OSProcessSpawner
* Closer to getting VS path lookup working.
* Make OSString assignable/ctor able
* Work out program files directory directly, so don't have to expand %%.
* WIP: Improve handling of process spawning.
* Add support for splitting input by line.
* * Correctly locates visual studio install
* Added functionality to invoke vs via cmd
* Add option to execute the command line.
* Handle in ProcessUtil for windows -> WinHandle.
* Rename files slang-win-visual-studio-util.cpp/.h and slang-process-util.h
* First pass at unix/linux version of ProcessUtil.
* Fix reading Visual Studio path from the registry.
* Get compiling on linux with.
* Fix vcvarsall.bat name
* Use ProcessUtil to execute external code.
* Remove OSProcessSpawner.
* Remove includes for "os.h" where no longer needed.
* Fix tabbing issue in premake5.lua
Remove test code from slang-test-main.cpp
* Fix premake4.lua tabbing issue.
* Small fixes to slang-process-util.h
Init ExecuteResult on Win execute.
* Improve comments.
* Fix bug in StringUtil::calcLines - with oddly terminated source input being able to read past end.
Make slang-generate use StringUtil over it's own impl.
* Fix off by one bug in working out Visual Studio version.
* Fix bug in calculating Visual Studio Version
* Fix compilation on linux with string parameter being passed to messageFormat.
* Remove erroneous use of kOSError codes - use Result.
* First effort to generate standard compiler options.
* Initial efforts in compiling source code in test framework for VisualStudio.
* Testing compiling c code on VisualStudio on Windows.
* Fix warning on linux.
* Fix clang on linux warning (and therefore failing) returning a StringBuilder as String.
* Disable return-std-move on clang.
* CommandLine arguments are now tagged if they are escaped or not. That it is the clients responsibility to escape command lines that cannot be automatically escaped.
* Add checks on unix/linux that command line args are all unescaped.
* WIP getting runtime GCC to work.
* First pass compiler working on unix-like targets.
* Enable c-compile.c test on 'smoke'.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/slang-test/slang-test-main.cpp | 57 |
1 files changed, 32 insertions, 25 deletions
diff --git a/tools/slang-test/slang-test-main.cpp b/tools/slang-test/slang-test-main.cpp index 96e5565fe..912d13b78 100644 --- a/tools/slang-test/slang-test-main.cpp +++ b/tools/slang-test/slang-test-main.cpp @@ -18,8 +18,12 @@ using namespace Slang; #include "options.h" #include "slangc-tool.h" +#include "../../source/core/slang-cpp-compiler.h" + #ifdef _WIN32 # include "../../source/core/windows/slang-win-visual-studio-util.h" +#else +# include "../../source/core/unix/slang-unix-cpp-compiler-util.h" #endif #include "../../source/core/slang-process-util.h" @@ -1090,7 +1094,6 @@ String getExpectedOutput(String const& outputStem) static TestResult runExecuteC(TestContext* context, TestInput& input) { -#ifdef _WIN32 // If we are just collecting requirements, say it passed if (context->isCollectingRequirements()) { @@ -1100,6 +1103,21 @@ static TestResult runExecuteC(TestContext* context, TestInput& input) auto filePath = input.filePath; auto outputStem = input.outputStem; + // Make the module name the same as the source file + String directory = Path::getParentDirectory(input.outputStem); + String moduleName = Path::getFileNameWithoutExt(filePath); + + String modulePath = Path::combine(directory, moduleName); + + CPPCompileOptions options; + + // Compile this source + options.sourceFiles.add(filePath); + options.modulePath = modulePath; + + ExecuteResult exeRes; + +#ifdef _WIN32 // Find List<WinVisualStudioUtil::VersionPath> versionPaths; WinVisualStudioUtil::find(versionPaths); @@ -1110,30 +1128,22 @@ static TestResult runExecuteC(TestContext* context, TestInput& input) return TestResult::Ignored; } - // Make the module name the same as the source file - String directory = Path::getParentDirectory(input.outputStem); - String moduleName = Path::getFileNameWithoutExt(filePath); - - String modulePath = Path::combine(directory, moduleName); + CommandLine cmdLine; + WinVisualStudioUtil::calcArgs(options, cmdLine); + if (SLANG_FAILED(WinVisualStudioUtil::executeCompiler(versionPaths[0], cmdLine, exeRes))) { - CPPCompileOptions options; - - // Compile this source - options.sourceFiles.add(filePath); - options.modulePath = modulePath; - - CommandLine cmdLine; - WinVisualStudioUtil::calcArgs(options, cmdLine); - - options.modulePath = moduleName; + return TestResult::Fail; + } +#else + CommandLine cmdLine; + UnixCPPCompilerUtil::calcArgs(options, cmdLine); - ExecuteResult exeRes; - if (SLANG_FAILED(WinVisualStudioUtil::executeCompiler(versionPaths[0], cmdLine, exeRes))) - { - return TestResult::Fail; - } + if (SLANG_FAILED(UnixCPPCompilerUtil::executeCompiler(cmdLine, exeRes))) + { + return TestResult::Fail; } +#endif // Execute the binary and see what we get { @@ -1167,7 +1177,7 @@ static TestResult runExecuteC(TestContext* context, TestInput& input) } // Compare if they are the same - if (actualOutput != expectedOutput) + if (!StringUtil::areLinesEqual(actualOutput.getUnownedSlice(), expectedOutput.getUnownedSlice())) { context->reporter->dumpOutputDifference(expectedOutput, actualOutput); return TestResult::Fail; @@ -1175,9 +1185,6 @@ static TestResult runExecuteC(TestContext* context, TestInput& input) } return TestResult::Pass; -#else - return TestResult::Ignored; -#endif } TestResult runCrossCompilerTest(TestContext* context, TestInput& input) |
