summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--source/slang/slang-options.cpp6
-rw-r--r--tests/preprocessor/file-identity/sub-folder/file-identity.slang2
-rw-r--r--tests/preprocessor/pragma-once.slang1
3 files changed, 8 insertions, 1 deletions
diff --git a/source/slang/slang-options.cpp b/source/slang/slang-options.cpp
index be88e9d8c..c07ace929 100644
--- a/source/slang/slang-options.cpp
+++ b/source/slang/slang-options.cpp
@@ -786,8 +786,14 @@ struct OptionsParser
}
else if (name == "load-file")
{
+ // OSFileSystem just implements loadFile interface, so will be wrapped with CacheFileSystem internally
spSetFileSystem(compileRequest, OSFileSystem::getSingleton());
}
+ else if (name == "os")
+ {
+ // OSFileSystemExt implements the ISlangFileSystemExt interface - and will be used directly
+ spSetFileSystem(compileRequest, OSFileSystemExt::getSingleton());
+ }
else
{
sink->diagnose(SourceLoc(), Diagnostics::unknownFileSystemOption, name);
diff --git a/tests/preprocessor/file-identity/sub-folder/file-identity.slang b/tests/preprocessor/file-identity/sub-folder/file-identity.slang
index 590b32a70..7514156ec 100644
--- a/tests/preprocessor/file-identity/sub-folder/file-identity.slang
+++ b/tests/preprocessor/file-identity/sub-folder/file-identity.slang
@@ -1,6 +1,6 @@
//TEST(smoke):SIMPLE:
//TEST(smoke):SIMPLE: -file-system load-file
-
+//TEST(smoke):SIMPLE: -file-system os
#include "../b.h"
#include "../c.h"
diff --git a/tests/preprocessor/pragma-once.slang b/tests/preprocessor/pragma-once.slang
index ef43ea265..f7e0a5a90 100644
--- a/tests/preprocessor/pragma-once.slang
+++ b/tests/preprocessor/pragma-once.slang
@@ -1,5 +1,6 @@
//TEST(smoke):SIMPLE:
//TEST(smoke):SIMPLE: -file-system load-file
+//TEST(smoke):SIMPLE: -file-system os
// Test support for `#pragma once`