Rename 'unittests' to 'gles-unittest'
Now that we have vk-unittests, it makes sense to prefix unittests by their API name.
Fixes a couple of TODOs
Change-Id: I57234d6b19c3dd4f130b211a0be4e604613b8cd8
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/28399
Presubmit-Ready: Ben Clayton <bclayton@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
Tested-by: Nicolas Capens <nicolascapens@google.com>
diff --git a/.travis.yml b/.travis.yml
index 815c05f..a4a5d5c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,7 @@
- mkdir -p build && cd build
- cmake -DREACTOR_BACKEND=$REACTOR_BACKEND ..
- make -j2
- - ./unittests
+ - ./gles-unittests
- ./ReactorUnitTests
notifications:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1ddb0ff..48e9d49 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2359,36 +2359,35 @@
endif()
endif()
-# GLES unit tests. TODO: Rename 'unittests' to 'gles-unittests'?
if(BUILD_TESTS)
- set(UNITTESTS_LIST
+ set(GLES_UNITTESTS_LIST
${CMAKE_CURRENT_SOURCE_DIR}/tests/GLESUnitTests/main.cpp
${CMAKE_CURRENT_SOURCE_DIR}/tests/GLESUnitTests/unittests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/third_party/googletest/googletest/src/gtest-all.cc
)
- set(UNITTESTS_INCLUDE_DIR
+ set(GLES_UNITTESTS_INCLUDE_DIR
${CMAKE_CURRENT_SOURCE_DIR}/third_party/googletest/googletest/include/
${CMAKE_CURRENT_SOURCE_DIR}/third_party/googletest/googlemock/include/
${CMAKE_CURRENT_SOURCE_DIR}/third_party/googletest/googletest/
${CMAKE_CURRENT_SOURCE_DIR}/include/
)
- add_executable(unittests ${UNITTESTS_LIST})
- set_target_properties(unittests PROPERTIES
- INCLUDE_DIRECTORIES "${UNITTESTS_INCLUDE_DIR}"
+ add_executable(gles-unittests ${GLES_UNITTESTS_LIST})
+ set_target_properties(gles-unittests PROPERTIES
+ INCLUDE_DIRECTORIES "${GLES_UNITTESTS_INCLUDE_DIR}"
FOLDER "Tests"
COMPILE_DEFINITIONS "STANDALONE"
)
- target_link_libraries(unittests libEGL libGLESv2 ${OS_LIBS})
+ target_link_libraries(gles-unittests libEGL libGLESv2 ${OS_LIBS})
if(ANDROID)
- target_link_libraries(unittests -landroid)
+ target_link_libraries(gles-unittests -landroid)
endif()
endif()
if(BUILD_TESTS AND BUILD_VULKAN)
- set(UNITTESTS_LIST
+ set(VK_UNITTESTS_LIST
${CMAKE_CURRENT_SOURCE_DIR}/tests/VulkanUnitTests/Device.cpp
${CMAKE_CURRENT_SOURCE_DIR}/tests/VulkanUnitTests/Driver.cpp
${CMAKE_CURRENT_SOURCE_DIR}/tests/VulkanUnitTests/main.cpp
@@ -2396,7 +2395,7 @@
${CMAKE_CURRENT_SOURCE_DIR}/third_party/googletest/googletest/src/gtest-all.cc
)
- set(UNITTESTS_INCLUDE_DIR
+ set(VK_UNITTESTS_INCLUDE_DIR
${CMAKE_CURRENT_SOURCE_DIR}/third_party/googletest/googletest/include/
${CMAKE_CURRENT_SOURCE_DIR}/third_party/googletest/googlemock/include/
${CMAKE_CURRENT_SOURCE_DIR}/third_party/googletest/googletest/
@@ -2404,9 +2403,9 @@
${CMAKE_CURRENT_SOURCE_DIR}/include/
)
- add_executable(vk-unittests ${UNITTESTS_LIST})
+ add_executable(vk-unittests ${VK_UNITTESTS_LIST})
set_target_properties(vk-unittests PROPERTIES
- INCLUDE_DIRECTORIES "${UNITTESTS_INCLUDE_DIR}"
+ INCLUDE_DIRECTORIES "${VK_UNITTESTS_INCLUDE_DIR}"
FOLDER "Tests"
COMPILE_DEFINITIONS "STANDALONE"
)
diff --git a/README.md b/README.md
index 8cfa348..a79bbe6 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@
cmake ..
make --jobs=8
- ./unittests
+ ./gles-unittests
./OGLES2HelloAPI
Usage
diff --git a/build/Visual Studio 15 2017 Win64/ALL_BUILD.vcxproj b/build/Visual Studio 15 2017 Win64/ALL_BUILD.vcxproj
index 56696ea..b9a9e0b 100644
--- a/build/Visual Studio 15 2017 Win64/ALL_BUILD.vcxproj
+++ b/build/Visual Studio 15 2017 Win64/ALL_BUILD.vcxproj
@@ -169,9 +169,9 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</ProjectReference>
- <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\unittests.vcxproj">
+ <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\gles-unittests.vcxproj">
<Project>{BC5A59A0-B151-32E5-9090-B06A8D88F902}</Project>
- <Name>unittests</Name>
+ <Name>gles-unittests</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</ProjectReference>
diff --git a/build/Visual Studio 15 2017 Win64/SwiftShader.sln b/build/Visual Studio 15 2017 Win64/SwiftShader.sln
index 7453c2e..5d7f0b6 100644
--- a/build/Visual Studio 15 2017 Win64/SwiftShader.sln
+++ b/build/Visual Studio 15 2017 Win64/SwiftShader.sln
@@ -193,7 +193,7 @@
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unittests", "unittests.vcxproj", "{BC5A59A0-B151-32E5-9090-B06A8D88F902}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gles-unittests", "gles-unittests.vcxproj", "{BC5A59A0-B151-32E5-9090-B06A8D88F902}"
ProjectSection(ProjectDependencies) = postProject
{B81F13DD-ACFB-3AB7-A071-3AD849D68E5C} = {B81F13DD-ACFB-3AB7-A071-3AD849D68E5C}
{2EA2C687-489E-32F2-8D89-B90620301359} = {2EA2C687-489E-32F2-8D89-B90620301359}
diff --git a/build/Visual Studio 15 2017 Win64/unittests.vcxproj b/build/Visual Studio 15 2017 Win64/gles-unittests.vcxproj
similarity index 96%
rename from build/Visual Studio 15 2017 Win64/unittests.vcxproj
rename to build/Visual Studio 15 2017 Win64/gles-unittests.vcxproj
index 7808ba0..7b2b593 100644
--- a/build/Visual Studio 15 2017 Win64/unittests.vcxproj
+++ b/build/Visual Studio 15 2017 Win64/gles-unittests.vcxproj
@@ -18,7 +18,7 @@
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
<Keyword>Win32Proj</Keyword>
<Platform>x64</Platform>
- <ProjectName>unittests</ProjectName>
+ <ProjectName>gles-unittests</ProjectName>
<VCProjectUpgraderObjectName>NoUpgrade</VCProjectUpgraderObjectName>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -42,14 +42,14 @@
<PropertyGroup>
<_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">unittests.dir\Debug\</IntDir>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">unittests</TargetName>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gles-unittests.dir\Debug\</IntDir>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gles-unittests</TargetName>
<TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.exe</TargetExt>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">unittests.dir\Release\</IntDir>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">unittests</TargetName>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gles-unittests.dir\Release\</IntDir>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gles-unittests</TargetName>
<TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.exe</TargetExt>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
@@ -91,8 +91,8 @@
<AdditionalOptions>%(AdditionalOptions) /machine:x64</AdditionalOptions>
<GenerateDebugInformation>true</GenerateDebugInformation>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <ImportLibrary>$(SolutionDir)build/Visual Studio 15 2017 Win64/Debug/unittests.lib</ImportLibrary>
- <ProgramDataBaseFile>$(SolutionDir)build/Visual Studio 15 2017 Win64/Debug/unittests.pdb</ProgramDataBaseFile>
+ <ImportLibrary>$(SolutionDir)build/Visual Studio 15 2017 Win64/Debug/gles-unittests.lib</ImportLibrary>
+ <ProgramDataBaseFile>$(SolutionDir)build/Visual Studio 15 2017 Win64/Debug/gles-unittests.pdb</ProgramDataBaseFile>
<SubSystem>Console</SubSystem>
</Link>
<ProjectReference>
@@ -136,8 +136,8 @@
<AdditionalOptions>%(AdditionalOptions) /machine:x64</AdditionalOptions>
<GenerateDebugInformation>false</GenerateDebugInformation>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <ImportLibrary>$(SolutionDir)build/Visual Studio 15 2017 Win64/Release/unittests.lib</ImportLibrary>
- <ProgramDataBaseFile>$(SolutionDir)build/Visual Studio 15 2017 Win64/Release/unittests.pdb</ProgramDataBaseFile>
+ <ImportLibrary>$(SolutionDir)build/Visual Studio 15 2017 Win64/Release/gles-unittests.lib</ImportLibrary>
+ <ProgramDataBaseFile>$(SolutionDir)build/Visual Studio 15 2017 Win64/Release/gles-unittests.pdb</ProgramDataBaseFile>
<SubSystem>Console</SubSystem>
</Link>
<ProjectReference>
diff --git a/build/Visual Studio 15 2017 Win64/unittests.vcxproj.filters b/build/Visual Studio 15 2017 Win64/gles-unittests.vcxproj.filters
similarity index 100%
rename from build/Visual Studio 15 2017 Win64/unittests.vcxproj.filters
rename to build/Visual Studio 15 2017 Win64/gles-unittests.vcxproj.filters
diff --git a/tests/kokoro/gcp_ubuntu/continuous.sh b/tests/kokoro/gcp_ubuntu/continuous.sh
index 6bee5f4..3e93dbc 100644
--- a/tests/kokoro/gcp_ubuntu/continuous.sh
+++ b/tests/kokoro/gcp_ubuntu/continuous.sh
@@ -17,9 +17,8 @@
# Run the reactor unit tests.
./ReactorUnitTests
-# Run the GLES unit tests. TODO(capn): rename.
-./unittests
+cd .. # Tests must be run from project root
-# Run the Vulkan unit tests.
-cd .. # Must be run from project root
+# Run the OpenGL ES and Vulkan unit tests.
+build/gles-unittests
build/vk-unittests