Skip to content

A
angle
Commit cc54ab36 by Austin Kinross Committed by Geoff Lang
Options

Generate tests.sln for WinRT, and make it include dEQP projects

Change-Id: I34284965f7b4f9d11aa7bab263292d4f41312d04 Reviewed-on: https://chromium-review.googlesource.com/297307Tested-by: 's avatarAustin Kinross <aukinros@microsoft.com> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent ee48376c
Showing with 43 additions and 34 deletions
build/ANGLE.gyp
...@@ -11,17 +11,16 @@ ...@@ -11,17 +11,16 @@
'dependencies': 'dependencies':
[ [
'../src/angle.gyp:*', '../src/angle.gyp:*',
'../src/tests/tests.gyp:*',
], ],
'conditions': 'conditions':
[ [
# Generate tests and sample projects for classic desktop # Don't generate samples for WinRT
# builds only.
['angle_build_winrt==0', ['angle_build_winrt==0',
{ {
'dependencies': 'dependencies':
[ [
'../samples/samples.gyp:*', '../samples/samples.gyp:*',
'../src/tests/tests.gyp:*',
], ],
}], }],
], ],
......
src/tests/deqp_support/angle_deqp_libtester_main.cpp
...@@ -55,9 +55,16 @@ const char *g_dEQPDataSearchDirs[] = ...@@ -55,9 +55,16 @@ const char *g_dEQPDataSearchDirs[] =
#if (DE_OS == DE_OS_WIN32) #if (DE_OS == DE_OS_WIN32)
deBool deIsDir(const char *filename) deBool deIsDir(const char *filename)
{ {
DWORD attribs = GetFileAttributesA(filename); WIN32_FILE_ATTRIBUTE_DATA fileInformation;
return (attribs != INVALID_FILE_ATTRIBUTES) &&
((attribs & FILE_ATTRIBUTE_DIRECTORY) > 0); BOOL result = GetFileAttributesExA(filename, GetFileExInfoStandard, &fileInformation);
if (result)
{
DWORD attribs = fileInformation.dwFileAttributes;
return (attribs != INVALID_FILE_ATTRIBUTES) && ((attribs & FILE_ATTRIBUTE_DIRECTORY) > 0);
}
return false;
} }
#elif (DE_OS == DE_OS_UNIX) #elif (DE_OS == DE_OS_UNIX)
deBool deIsDir(const char *filename) deBool deIsDir(const char *filename)
......
src/tests/tests.gyp
...@@ -42,41 +42,44 @@ ...@@ -42,41 +42,44 @@
'third_party/rapidjson/include/rapidjson/msinttypes/stdint.h', 'third_party/rapidjson/include/rapidjson/msinttypes/stdint.h',
], ],
}, },
'targets': 'conditions':
[ [
# GoogleTest doesn't support WinRT
['angle_build_winrt==0',
{ {
'target_name': 'angle_test_support', 'targets':
'type': 'none',
'conditions':
[ [
['angle_standalone==1',
{ {
'dependencies': [ 'target_name': 'angle_test_support',
'angle_internal_gmock', 'type': 'none',
'angle_internal_gtest', 'conditions':
[
['angle_standalone==1',
{
'dependencies': [
'angle_internal_gmock',
'angle_internal_gtest',
],
},
{
'dependencies': [
'<(DEPTH)/testing/gmock.gyp:gmock',
'<(DEPTH)/testing/gtest.gyp:gtest',
],
'all_dependent_settings':
{
'include_dirs':
[
'<(DEPTH)/testing/gmock/include',
'<(DEPTH)/testing/gtest/include',
],
},
}],
], ],
}, },
{
'dependencies': [
'<(DEPTH)/testing/gmock.gyp:gmock',
'<(DEPTH)/testing/gtest.gyp:gtest',
],
'all_dependent_settings':
{
'include_dirs':
[
'<(DEPTH)/testing/gmock/include',
'<(DEPTH)/testing/gtest/include',
],
},
}],
], ],
}, }],
], ['angle_standalone==1 and angle_build_winrt==0',
'conditions':
[
['angle_standalone==1',
{ {
'targets': 'targets':
[ [
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment