Handling of temporary files (#2299)

* #include an absolute path didn't work - because paths were taken to always be relative.

* Work around windows issue with temporary file clash.

* Handle the temporary file path actually creates a file.

* Fix typo.

* Fix typo in linux for temporary file.

* Add unit test for io. Tests generateTemporary operation.

2 files changed, 80 insertions, 6 deletions

diff --git a/tools/slang-test/slang-test-main.cpp b/tools/slang-test/slang-test-main.cpp
index 7e504da74..ea5ada4b0 100644
--- a/tools/slang-test/slang-test-main.cpp
+++ b/tools/slang-test/slang-test-main.cpp
@@ -1203,15 +1203,21 @@ static SlangResult _executeBinary(const UnownedStringSlice& hexDump, ExecuteResu
     List<uint8_t> data;
     SLANG_RETURN_ON_FAIL(HexDumpUtil::parseWithMarkers(hexDump, data));
 
+    TemporaryFileSet temporaryFileSet;
+
     // Need to write this off to a temporary file
-    String fileName;
-    SLANG_RETURN_ON_FAIL(File::generateTemporary(UnownedStringSlice("slang-test"), fileName));
+
+    String temporaryLockPath;
+
+    SLANG_RETURN_ON_FAIL(File::generateTemporary(UnownedStringSlice("slang-test"), temporaryLockPath));
+    String fileName = temporaryLockPath;
+    // And the temporary lock path
+    temporaryFileSet.add(temporaryLockPath);
 
     fileName.append(Process::getExecutableSuffix());
 
-    TemporaryFileSet temporaryFileSet;
     temporaryFileSet.add(fileName);
-
+    
     {
         ComPtr<ISlangWriter> writer;
         SLANG_RETURN_ON_FAIL(FileWriter::createBinary(fileName.getBuffer(), 0, writer));
@@ -1979,8 +1985,12 @@ static SlangResult _loadAsSharedLibrary(const UnownedStringSlice& hexDump, Tempo
     SLANG_RETURN_ON_FAIL(HexDumpUtil::parseWithMarkers(hexDump, data));
 
     // Need to write this off to a temporary file
-    String fileName;
-    SLANG_RETURN_ON_FAIL(File::generateTemporary(UnownedStringSlice("slang-test"), fileName));
+    
+    String temporaryLockPath;
+    SLANG_RETURN_ON_FAIL(File::generateTemporary(UnownedStringSlice("slang-test"), temporaryLockPath));
+    inOutTemporaryFileSet.add(temporaryLockPath);
+
+    String fileName = temporaryLockPath;
 
     // Need to work out the dll name
     String sharedLibraryName = SharedLibrary::calcPlatformPath(fileName.getUnownedSlice());
diff --git a/tools/slang-unit-test/unit-test-io.cpp b/tools/slang-unit-test/unit-test-io.cpp
new file mode 100644
index 000000000..fbac5af17
--- /dev/null
+++ b/tools/slang-unit-test/unit-test-io.cpp
@@ -0,0 +1,64 @@
+// unit-test-io.cpp
+
+#include "../../source/core/slang-io.h"
+
+#include "tools/unit-test/slang-unit-test.h"
+
+using namespace Slang;
+
+static SlangResult _checkGenerateTemporary()
+{
+    /// Test temporary file functionality
+    
+    List<String> paths;
+
+    for (Index i = 0; i < 10; ++i)
+    {
+        String path;
+        SLANG_RETURN_ON_FAIL(File::generateTemporary(toSlice("slang-check"), path));
+
+        // The path should exist exist
+        SLANG_CHECK(File::exists(path));
+
+        if (paths.contains(path))
+        {
+            return SLANG_FAIL;
+        }
+
+        paths.add(path);
+    }
+
+    // It should be possible to write to the temporary files
+    for (auto& path : paths)
+    {
+        SLANG_RETURN_ON_FAIL(File::writeAllText(path, path));
+    }
+    // It should be possible to read from the temporary files
+
+    for (auto& path : paths)
+    {
+        String contents;
+        SLANG_RETURN_ON_FAIL(File::readAllText(path, contents))
+
+        SLANG_CHECK(contents == path);
+    }
+
+    // Remove all the temporary files
+    for (auto& path : paths)
+    {
+        SLANG_CHECK(File::exists(path));
+        
+        const auto removeResult = File::remove(path);
+        SLANG_CHECK(SLANG_SUCCEEDED(removeResult));
+
+        // Check remove worked
+        SLANG_CHECK(!File::exists(path));
+    }
+
+    return SLANG_OK;
+}
+
+SLANG_UNIT_TEST(io)
+{
+    SLANG_CHECK(SLANG_SUCCEEDED(_checkGenerateTemporary()));
+}