[Test] enable rewriter test for linux (microsoft#5908)

Added InitSupport to setup m_dllSupport and m_pIncludeHandler.

Work around GetTempPathW and GetFileSize.

RewriterTest.RunNonUnicode is disabled for dependent on Greek language
support.

This is for
microsoft#5877

Author: python3kgae

tools/clang/test/HLSL/rewriter/includes.hlsl

@@ -1,6 +1,6 @@
 #include "toinclude.hlsl"
 #include "..\toinclude2.hlsl"
-#include "\for_includes_test\toinclude3.hlsl"
+#include "for_includes_test\toinclude3.hlsl"
 
 int func1(int b){
   return includedFunc(b);
@@ -12,4 +12,4 @@ int func2(int d){
 
 int func3(int f){
   return includedFunc3(f);
-}
+}

tools/clang/unittests/HLSL/CMakeLists.txt

@@ -56,7 +56,6 @@ else (WIN32)
 set(HLSL_IGNORE_SOURCES
   MSFileSysTest.cpp
   PixDiaTest.cpp
-  RewriterTest.cpp
   )
 
 add_clang_unittest(ClangHLSLTests
@@ -73,6 +72,7 @@ add_clang_unittest(ClangHLSLTests
   Objects.cpp
   OptimizerTest.cpp
   OptionsTest.cpp
+  RewriterTest.cpp
   PixTest.cpp
   PixTestUtils.cpp
   SystemValueTest.cpp

tools/clang/unittests/HLSL/RewriterTest.cpp

@@ -28,11 +28,15 @@
 #include <cassert>
 #include <sstream>
 #include <algorithm>
+#ifdef _WIN32
 #include <windows.h>
 #include <unknwn.h>
+#endif
 #include "dxc/dxcapi.h"
+#ifdef _WIN32
 #include <atlbase.h>
 #include <atlfile.h>
+#endif
 
 #include "dxc/Test/HLSLTestData.h"
 #include "dxc/Test/HlslTestUtils.h"
@@ -47,50 +51,56 @@
 using namespace std;
 using namespace hlsl_test;
 
+#ifdef _WIN32
 class RewriterTest {
+#else
+class RewriterTest : public ::testing::Test {
+#endif
 public:
   BEGIN_TEST_CLASS(RewriterTest)
   TEST_CLASS_PROPERTY(L"Parallel", L"true")
   TEST_METHOD_PROPERTY(L"Priority", L"0")
   END_TEST_CLASS()
 
-  TEST_METHOD(RunArrayLength);
-  TEST_METHOD(RunAttributes);
-  TEST_METHOD(RunAnonymousStruct);
-  TEST_METHOD(RunCppErrors);
-  TEST_METHOD(RunForceExtern);
-  TEST_METHOD(RunIndexingOperator);
-  TEST_METHOD(RunIntrinsicExamples);
-  TEST_METHOD(RunMatrixAssignments);
-  TEST_METHOD(RunMatrixPackOrientation);
-  TEST_METHOD(RunMatrixSyntax);
-  TEST_METHOD(RunPackReg);
-  TEST_METHOD(RunScalarAssignments);
-  TEST_METHOD(RunShared);
-  TEST_METHOD(RunStructAssignments);
-  TEST_METHOD(RunTemplateChecks);
-  TEST_METHOD(RunTypemodsSyntax);
-  TEST_METHOD(RunVarmodsSyntax);
-  TEST_METHOD(RunVectorAssignments);
-  TEST_METHOD(RunVectorSyntaxMix);
-  TEST_METHOD(RunVectorSyntax);
-  TEST_METHOD(RunIncludes);
-  TEST_METHOD(RunSpirv);
-  TEST_METHOD(RunStructMethods);
-  TEST_METHOD(RunPredefines);
-  TEST_METHOD(RunWideOneByte);
-  TEST_METHOD(RunWideTwoByte);
-  TEST_METHOD(RunWideThreeByteBadChar);
-  TEST_METHOD(RunWideThreeByte);
-  TEST_METHOD(RunNonUnicode);
-  TEST_METHOD(RunEffect);
-  TEST_METHOD(RunSemanticDefines);
-  TEST_METHOD(RunNoFunctionBody);
-  TEST_METHOD(RunNoFunctionBodyInclude);
-  TEST_METHOD(RunNoStatic);
-  TEST_METHOD(RunKeepUserMacro);
-  TEST_METHOD(RunExtractUniforms);
-  TEST_METHOD(RunGlobalsUsedInMethod);
+  TEST_CLASS_SETUP(InitSupport);
+
+  TEST_METHOD(RunArrayLength)
+  TEST_METHOD(RunAttributes)
+  TEST_METHOD(RunAnonymousStruct)
+  TEST_METHOD(RunCppErrors)
+  TEST_METHOD(RunForceExtern)
+  TEST_METHOD(RunIndexingOperator)
+  TEST_METHOD(RunIntrinsicExamples)
+  TEST_METHOD(RunMatrixAssignments)
+  TEST_METHOD(RunMatrixPackOrientation)
+  TEST_METHOD(RunMatrixSyntax)
+  TEST_METHOD(RunPackReg)
+  TEST_METHOD(RunScalarAssignments)
+  TEST_METHOD(RunShared)
+  TEST_METHOD(RunStructAssignments)
+  TEST_METHOD(RunTemplateChecks)
+  TEST_METHOD(RunTypemodsSyntax)
+  TEST_METHOD(RunVarmodsSyntax)
+  TEST_METHOD(RunVectorAssignments)
+  TEST_METHOD(RunVectorSyntaxMix)
+  TEST_METHOD(RunVectorSyntax)
+  TEST_METHOD(RunIncludes)
+  TEST_METHOD(RunSpirv)
+  TEST_METHOD(RunStructMethods)
+  TEST_METHOD(RunPredefines)
+  TEST_METHOD(RunWideOneByte)
+  TEST_METHOD(RunWideTwoByte)
+  TEST_METHOD(RunWideThreeByteBadChar)
+  TEST_METHOD(RunWideThreeByte)
+  TEST_METHOD(RunNonUnicode)
+  TEST_METHOD(RunEffect)
+  TEST_METHOD(RunSemanticDefines)
+  TEST_METHOD(RunNoFunctionBody)
+  TEST_METHOD(RunNoFunctionBodyInclude)
+  TEST_METHOD(RunNoStatic)
+  TEST_METHOD(RunKeepUserMacro)
+  TEST_METHOD(RunExtractUniforms)
+  TEST_METHOD(RunGlobalsUsedInMethod)
   TEST_METHOD(RunRewriterFails)
 
   dxc::DxcDllSupport m_dllSupport;
@@ -141,13 +151,6 @@ class RewriterTest {
   }
 
   HRESULT CreateRewriter(IDxcRewriter **pRewriter) {
-    if (!m_dllSupport.IsEnabled()) {
-      VERIFY_SUCCEEDED(m_dllSupport.Initialize());
-
-      CComPtr<IDxcLibrary> library;
-      VERIFY_SUCCEEDED(m_dllSupport.CreateInstance(CLSID_DxcLibrary, &library));
-      VERIFY_SUCCEEDED(library->CreateIncludeHandler(&m_pIncludeHandler));
-    }
     return m_dllSupport.CreateInstance(CLSID_DxcRewriter, pRewriter);
   }
 
@@ -168,33 +171,21 @@ class RewriterTest {
   }
 
   struct FileWithBlob {
-    CAtlFile file;
-    CAtlFileMapping<char> mapping;
     CComPtr<IDxcBlobEncoding> BlobEncoding;
 
     FileWithBlob(dxc::DxcDllSupport &support, LPCWSTR path) {
-      IFT(file.Create(path, GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING));
-      IFT(mapping.MapFile(file));
       CComPtr<IDxcLibrary> library;
       IFT(support.CreateInstance(CLSID_DxcLibrary, &library));
-      IFT(library->CreateBlobWithEncodingFromPinned(
-          mapping.GetData(), mapping.GetMappingSize(), CP_UTF8, &BlobEncoding));
+      UINT32 codePage = CP_UTF8;
+      IFT(library->CreateBlobFromFile(path, &codePage, &BlobEncoding));
     }
   };
 
   bool CompareGold(std::string &firstPass, LPCWSTR goldPath) {
-    HANDLE goldHandle =
-        CreateFileW(goldPath, GENERIC_READ, 0, 0, OPEN_EXISTING, 0, 0);
-    VERIFY_ARE_NOT_EQUAL(goldHandle, INVALID_HANDLE_VALUE);
-    CHandle checkedGoldHandle(goldHandle);
-
-    DWORD gFileSize = GetFileSize(goldHandle, NULL);
-    CComHeapPtr<char> gReadBuff;
-    VERIFY_IS_TRUE(gReadBuff.AllocateBytes(gFileSize));
-    DWORD gnumActualRead;
-    VERIFY_WIN32_BOOL_SUCCEEDED(ReadFile(checkedGoldHandle, gReadBuff.m_pData,
-                                         gFileSize, &gnumActualRead, NULL));
-    std::string gold = std::string((LPSTR)gReadBuff, gnumActualRead);
+    FileWithBlob goldBlob(m_dllSupport, goldPath);
+    std::string gold =
+        std::string((LPSTR)goldBlob.BlobEncoding->GetBufferPointer(),
+                    goldBlob.BlobEncoding->GetBufferSize());
     gold.erase(std::remove(gold.begin(), gold.end(), '\r'), gold.end());
 
     // Kept because useful for debugging
@@ -265,9 +256,16 @@ class RewriterTest {
     TestFileName = TestFileName.substr(index1 + 1, index2 - (index1 + 1));
 
     wchar_t TempPath[MAX_PATH];
+#ifdef _WIN32
     DWORD length = GetTempPathW(MAX_PATH, TempPath);
     VERIFY_WIN32_BOOL_SUCCEEDED(length != 0);
-
+#else
+    const char *TempDir = std::getenv("TMPDIR");
+    if (TempDir == nullptr) {
+      TempDir = "/tmp";
+    }
+    mbstowcs(TempPath, TempDir, strlen(TempDir) + 1);
+#endif
     std::wstring PrintName(TempPath);
     PrintName += TestFileName;
     PrintName += L"_rewrite_test_pass.txt";
@@ -314,6 +312,16 @@ class RewriterTest {
   }
 };
 
+bool RewriterTest::InitSupport() {
+  if (!m_dllSupport.IsEnabled()) {
+    VERIFY_SUCCEEDED(m_dllSupport.Initialize());
+    CComPtr<IDxcLibrary> library;
+    VERIFY_SUCCEEDED(m_dllSupport.CreateInstance(CLSID_DxcLibrary, &library));
+    VERIFY_SUCCEEDED(library->CreateIncludeHandler(&m_pIncludeHandler));
+  }
+  return true;
+}
+
 TEST_F(RewriterTest, RunArrayLength) {
   CheckVerifiesHLSL(L"rewriter\\array-length-rw.hlsl",
                     L"rewriter\\correct_rewrites\\array-length-rw_gold.hlsl");
@@ -561,7 +569,12 @@ TEST_F(RewriterTest, RunWideThreeByte) {
       0); // const added by default
 }
 
+#ifdef _WIN32
 TEST_F(RewriterTest, RunNonUnicode) {
+#else
+// Need to enable ANSI Greek support.
+TEST_F(RewriterTest, DISABLED_RunNonUnicode) {
+#endif
   CComPtr<IDxcRewriter> pRewriter;
   VERIFY_SUCCEEDED(CreateRewriter(&pRewriter));
   CComPtr<IDxcOperationResult> pRewriteResult;