| Index: tests/skia_test.cpp
|
| diff --git a/tests/skia_test.cpp b/tests/skia_test.cpp
|
| index 48d87719d562c31c4cb7a3116f49d96fb41e4992..75d597fd7d04edc82acb3b8a7cacc24bba9cd580 100644
|
| --- a/tests/skia_test.cpp
|
| +++ b/tests/skia_test.cpp
|
| @@ -29,8 +29,6 @@ DEFINE_string2(match, m, NULL, "[~][^]substring[$] [...] of test name to run.\n"
|
| "^ and $ requires an exact match\n" \
|
| "If a test does not match any list entry,\n" \
|
| "it is skipped unless some list entry starts with ~");
|
| -DEFINE_string2(tmpDir, t, NULL, "tmp directory for tests to use.");
|
| -DEFINE_string2(resourcePath, i, "resources", "directory for test resources.");
|
| DEFINE_bool2(extendedTest, x, false, "run extended tests for pathOps.");
|
| DEFINE_bool2(leaks, l, false, "show leaked ref cnt'd objects.");
|
| DEFINE_bool2(single, z, false, "run tests on a single thread internally.");
|
| @@ -98,16 +96,6 @@ private:
|
| const int fTotal;
|
| };
|
|
|
| -SkString Test::GetTmpDir() {
|
| - const char* tmpDir = FLAGS_tmpDir.isEmpty() ? NULL : FLAGS_tmpDir[0];
|
| - return SkString(tmpDir);
|
| -}
|
| -
|
| -SkString Test::GetResourcePath() {
|
| - const char* resourcePath = FLAGS_resourcePath.isEmpty() ? NULL : FLAGS_resourcePath[0];
|
| - return SkString(resourcePath);
|
| -}
|
| -
|
| // Deletes self when run.
|
| class SkTestRunnable : public SkRunnable {
|
| public:
|
| @@ -226,7 +214,6 @@ int tool_main(int argc, char** argv) {
|
| toRun, failCount, skipCount, reporter.countTests());
|
| }
|
| SkGraphics::Term();
|
| - GpuTest::DestroyContexts();
|
|
|
| SkDebugf("\n");
|
| return (failCount == 0) ? 0 : 1;
|
|
|