Commit ccda698b by Corentin Wallez

Remove redundant chdir in angle_deqp_test_main

Fixes the tests not running directly from the VS UI. BUG=angleproject:1051 Change-Id: Ia299d8e7ad676330902725c114e8f5766db49d82 Reviewed-on: https://chromium-review.googlesource.com/283158Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Tested-by: 's avatarCorentin Wallez <cwallez@chromium.org>
parent c491e0fb
...@@ -1239,14 +1239,6 @@ ...@@ -1239,14 +1239,6 @@
{ {
'target_name': 'angle_deqp_gles2_tests', 'target_name': 'angle_deqp_gles2_tests',
'type': 'executable', 'type': 'executable',
'defines':
[
# Hard-code the path to dEQP. This lets the
# app locate the data folder without need
# for a copy. gyp recursive copies are not
# implemented properly on Windows.
'ANGLE_DEQP_DIR="<(deqp_path)"',
],
'dependencies': 'dependencies':
[ [
'angle_deqp_libgles2', 'angle_deqp_libgles2',
...@@ -1260,14 +1252,6 @@ ...@@ -1260,14 +1252,6 @@
{ {
'target_name': 'angle_deqp_gles3_tests', 'target_name': 'angle_deqp_gles3_tests',
'type': 'executable', 'type': 'executable',
'defines':
[
# Hard-code the path to dEQP. This lets the
# app locate the data folder without need
# for a copy. gyp recursive copies are not
# implemented properly on Windows.
'ANGLE_DEQP_DIR="<(deqp_path)"',
],
'dependencies': 'dependencies':
[ [
'angle_deqp_libgles3', 'angle_deqp_libgles3',
......
...@@ -6,24 +6,9 @@ ...@@ -6,24 +6,9 @@
// angle_deqp_tests_main.cpp: Entry point for ANGLE's dEQP tests. // angle_deqp_tests_main.cpp: Entry point for ANGLE's dEQP tests.
#include <cstdio>
#include "angle_deqp_libtester.h" #include "angle_deqp_libtester.h"
#ifdef _WIN32
#include <direct.h>
#define chdir _chdir
#else
#include <unistd.h>
#endif
int main(int argc, const char *argv[]) int main(int argc, const char *argv[])
{ {
const char * data_dir = ANGLE_DEQP_DIR "/data";
if (chdir(data_dir) != 0)
{
printf("Error setting working directory to %s\n", data_dir);
}
return deqp_libtester_main(argc, argv); return deqp_libtester_main(argc, argv);
} }
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