Move GLES unit tests

GLES unit tests were in the generic "unittests" directory.
In order to avoid confusion with Vulkan unit tests, the
GLES unit tests directory was renamed to GLESUnitTests.

Change-Id: Idc40f63daddc6f822207fc4a75dd037a46ae22a6
Reviewed-on: https://swiftshader-review.googlesource.com/c/21628
Tested-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>

diff --git a/Android.mk b/Android.mk
index bccaf14..5165436 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -63,7 +63,7 @@ endif
 
 ifneq ($(swiftshader_unsupported_build),true)
 include $(swiftshader_root)/src/Android.mk
-include $(swiftshader_root)/tests/unittests/Android.mk
+include $(swiftshader_root)/tests/GLESUnitTests/Android.mk
 ifeq ($(REACTOR_LLVM_VERSION),3)
 include $(swiftshader_root)/third_party/LLVM/Android.mk
 else

diff --git a/BUILD.gn b/BUILD.gn
index d218425..b36d9f9 100644 (file)
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -142,6 +142,6 @@ group("swiftshader_tests") {
   testonly = true
 
   data_deps = [
-    "tests/unittests:swiftshader_unittests",
+    "tests/GLESUnitTests:swiftshader_unittests",
   ]
 }

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d6f53af..90a62fa 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2125,8 +2125,8 @@ endif()
 
 if(BUILD_TESTS)
     set(UNITTESTS_LIST
-        ${CMAKE_SOURCE_DIR}/tests/unittests/main.cpp
-        ${CMAKE_SOURCE_DIR}/tests/unittests/unittests.cpp
+        ${CMAKE_SOURCE_DIR}/tests/GLESUnitTests/main.cpp
+        ${CMAKE_SOURCE_DIR}/tests/GLESUnitTests/unittests.cpp
         ${CMAKE_SOURCE_DIR}/third_party/googletest/googletest/src/gtest-all.cc
     )
 

diff --git a/SwiftShader.sln b/SwiftShader.sln
index 990830b..4f0986f 100644 (file)
--- a/SwiftShader.sln
+++ b/SwiftShader.sln
@@ -248,7 +248,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Subzero", "src\Reactor\Subz
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SubzeroLLVMDependencies", "src\Reactor\SubzeroLLVMDependencies.vcxproj", "{E3BBD7DA-45C1-43EF-9C87-3F411031BDE4}"\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GLESUnitTests", "tests\unittests\GLESUnitTests.vcxproj", "{CF8EBC89-8762-49DC-9440-6C82B3499913}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GLESUnitTests", "tests\GLESUnitTests\GLESUnitTests.vcxproj", "{CF8EBC89-8762-49DC-9440-6C82B3499913}"\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VertexRoutineFuzzer", "tests\fuzzers\VertexRoutineFuzzer.vcxproj", "{FBDCFF88-0CE1-43C3-B694-8F45946FAFE3}"\r
        ProjectSection(ProjectDependencies) = postProject\r

diff --git a/tests/unittests/Android.mk b/tests/GLESUnitTests/Android.mk
similarity index 100%
rename from tests/unittests/Android.mk
rename to tests/GLESUnitTests/Android.mk

diff --git a/tests/unittests/BUILD.gn b/tests/GLESUnitTests/BUILD.gn
similarity index 100%
rename from tests/unittests/BUILD.gn
rename to tests/GLESUnitTests/BUILD.gn

diff --git a/tests/unittests/GLESUnitTests.vcxproj b/tests/GLESUnitTests/GLESUnitTests.vcxproj
similarity index 95%
rename from tests/unittests/GLESUnitTests.vcxproj
rename to tests/GLESUnitTests/GLESUnitTests.vcxproj
index 7769b92..3942209 100644 (file)
--- a/tests/unittests/GLESUnitTests.vcxproj
+++ b/tests/GLESUnitTests/GLESUnitTests.vcxproj
@@ -105,6 +105,7 @@
       <ForcedIncludeFiles>\r
       </ForcedIncludeFiles>\r
       <TreatSpecificWarningsAsErrors>4018;5038;4838</TreatSpecificWarningsAsErrors>\r
+      <AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>\r
     </ClCompile>\r
     <Link>\r
       <SubSystem>Console</SubSystem>\r
@@ -123,6 +124,7 @@
       <ForcedIncludeFiles>\r
       </ForcedIncludeFiles>\r
       <TreatSpecificWarningsAsErrors>4018;5038;4838</TreatSpecificWarningsAsErrors>\r
+      <AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>\r
     </ClCompile>\r
     <Link>\r
       <SubSystem>Console</SubSystem>\r
@@ -143,6 +145,7 @@
       <ForcedIncludeFiles>\r
       </ForcedIncludeFiles>\r
       <TreatSpecificWarningsAsErrors>4018;5038;4838</TreatSpecificWarningsAsErrors>\r
+      <AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>\r
     </ClCompile>\r
     <Link>\r
       <SubSystem>Console</SubSystem>\r
@@ -165,6 +168,7 @@
       <ForcedIncludeFiles>\r
       </ForcedIncludeFiles>\r
       <TreatSpecificWarningsAsErrors>4018;5038;4838</TreatSpecificWarningsAsErrors>\r
+      <AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>\r
     </ClCompile>\r
     <Link>\r
       <SubSystem>Console</SubSystem>\r

diff --git a/tests/unittests/GLESUnitTests.vcxproj.filters b/tests/GLESUnitTests/GLESUnitTests.vcxproj.filters
similarity index 100%
rename from tests/unittests/GLESUnitTests.vcxproj.filters
rename to tests/GLESUnitTests/GLESUnitTests.vcxproj.filters

diff --git a/tests/unittests/GLESUnitTests.vcxproj.user b/tests/GLESUnitTests/GLESUnitTests.vcxproj.user
similarity index 100%
rename from tests/unittests/GLESUnitTests.vcxproj.user
rename to tests/GLESUnitTests/GLESUnitTests.vcxproj.user

diff --git a/tests/unittests/SwiftShaderTest.h b/tests/GLESUnitTests/SwiftShaderTest.h
similarity index 100%
rename from tests/unittests/SwiftShaderTest.h
rename to tests/GLESUnitTests/SwiftShaderTest.h

diff --git a/tests/unittests/main.cpp b/tests/GLESUnitTests/main.cpp
similarity index 100%
rename from tests/unittests/main.cpp
rename to tests/GLESUnitTests/main.cpp

diff --git a/tests/unittests/unittests.cpp b/tests/GLESUnitTests/unittests.cpp
similarity index 100%
rename from tests/unittests/unittests.cpp
rename to tests/GLESUnitTests/unittests.cpp