Commit 740c4ea7 by Jamie Madill Committed by Commit Bot

Invoke the standalone test harness runner.

Previously we were still calling GoogleTest directly. This change switches the test main funtions to call the standalone harness. Only affects standalone and shouldn't affect the tests in Chromium or on the current test setup. Bug: angleproject:3162 Change-Id: Ia5a5a73d47c0b47b4df8f54cd6df71da2d878847 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1998661 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarJonah Ryan-Davis <jonahr@google.com>
parent 238adb7a
...@@ -21,6 +21,5 @@ int main(int argc, char **argv) ...@@ -21,6 +21,5 @@ int main(int argc, char **argv)
{ {
angle::InitTestHarness(&argc, argv); angle::InitTestHarness(&argc, argv);
angle::TestSuite testSuite(&argc, argv); angle::TestSuite testSuite(&argc, argv);
int rt = RUN_ALL_TESTS(); return testSuite.run();
return rt;
} }
...@@ -13,6 +13,5 @@ int main(int argc, char **argv) ...@@ -13,6 +13,5 @@ int main(int argc, char **argv)
{ {
angle::TestSuite testSuite(&argc, argv); angle::TestSuite testSuite(&argc, argv);
ANGLEProcessTestArgs(&argc, argv); ANGLEProcessTestArgs(&argc, argv);
int rt = RUN_ALL_TESTS(); return testSuite.run();
return rt;
} }
...@@ -17,6 +17,5 @@ int main(int argc, char **argv) ...@@ -17,6 +17,5 @@ int main(int argc, char **argv)
{ {
angle::TestSuite testSuite(&argc, argv); angle::TestSuite testSuite(&argc, argv);
ANGLEProcessPerfTestArgs(&argc, argv); ANGLEProcessPerfTestArgs(&argc, argv);
int rt = RUN_ALL_TESTS(); return testSuite.run();
return rt;
} }
...@@ -12,6 +12,5 @@ int main(int argc, char **argv) ...@@ -12,6 +12,5 @@ int main(int argc, char **argv)
{ {
angle::TestSuite testSuite(&argc, argv); angle::TestSuite testSuite(&argc, argv);
testing::AddGlobalTestEnvironment(new ANGLETestEnvironment()); testing::AddGlobalTestEnvironment(new ANGLETestEnvironment());
int rt = RUN_ALL_TESTS(); return testSuite.run();
return rt;
} }
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