Commit cc54ab36 by Austin Kinross Committed by Geoff Lang

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
......@@ -11,17 +11,16 @@
'dependencies':
[
'../src/angle.gyp:*',
'../src/tests/tests.gyp:*',
],
'conditions':
[
# Generate tests and sample projects for classic desktop
# builds only.
# Don't generate samples for WinRT
['angle_build_winrt==0',
{
'dependencies':
[
'../samples/samples.gyp:*',
'../src/tests/tests.gyp:*',
],
}],
],
......
......@@ -55,9 +55,16 @@ const char *g_dEQPDataSearchDirs[] =
#if (DE_OS == DE_OS_WIN32)
deBool deIsDir(const char *filename)
{
DWORD attribs = GetFileAttributesA(filename);
return (attribs != INVALID_FILE_ATTRIBUTES) &&
((attribs & FILE_ATTRIBUTE_DIRECTORY) > 0);
WIN32_FILE_ATTRIBUTE_DATA fileInformation;
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)
deBool deIsDir(const char *filename)
......
......@@ -42,41 +42,44 @@
'third_party/rapidjson/include/rapidjson/msinttypes/stdint.h',
],
},
'targets':
'conditions':
[
# GoogleTest doesn't support WinRT
['angle_build_winrt==0',
{
'target_name': 'angle_test_support',
'type': 'none',
'conditions':
'targets':
[
['angle_standalone==1',
{
'dependencies': [
'angle_internal_gmock',
'angle_internal_gtest',
'target_name': 'angle_test_support',
'type': 'none',
'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',
],
},
}],
],
},
],
'conditions':
[
['angle_standalone==1',
}],
['angle_standalone==1 and angle_build_winrt==0',
{
'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