aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests
diff options
context:
space:
mode:
authorGravatar borenet <borenet@google.com>2015-04-02 12:16:36 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-04-02 12:16:36 -0700
commit4808757d7a8bbe8c773a312a894738e9ff701b5f (patch)
tree62eb6866702dbd1df89964c7659e39bda2bfdea3 /tests
parent07342361a3cda94376230b37d9e863052449653c (diff)
Remove all code related to NaCl
Diffstat (limited to 'tests')
-rwxr-xr-xtests/PathOpsSkpClipTest.cpp9
-rw-r--r--tests/skia_test.cpp2
2 files changed, 9 insertions, 2 deletions
diff --git a/tests/PathOpsSkpClipTest.cpp b/tests/PathOpsSkpClipTest.cpp
index 9a23eaa377..1f69ff05e1 100755
--- a/tests/PathOpsSkpClipTest.cpp
+++ b/tests/PathOpsSkpClipTest.cpp
@@ -1,3 +1,10 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
#include "CrashHandler.h"
// #include "OverwriteLine.h"
#include "Resources.h"
@@ -1099,7 +1106,7 @@ int tool_main(int argc, char** argv) {
return 0;
}
-#if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL)
+#if !defined(SK_BUILD_FOR_IOS)
int main(int argc, char * const argv[]) {
return tool_main(argc, (char**) argv);
}
diff --git a/tests/skia_test.cpp b/tests/skia_test.cpp
index 1b92290808..3379e3971d 100644
--- a/tests/skia_test.cpp
+++ b/tests/skia_test.cpp
@@ -229,7 +229,7 @@ int test_main() {
return (status.failCount() == 0) ? 0 : 1;
}
-#if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL)
+#if !defined(SK_BUILD_FOR_IOS)
int main(int argc, char** argv) {
SkCommandLineFlags::Parse(argc, argv);
return test_main();