diff options
| author | Wei-Ta Chen <weita@google.com> | 2009-05-21 13:09:45 -0700 |
|---|---|---|
| committer | Wei-Ta Chen <weita@google.com> | 2009-05-26 11:23:09 -0700 |
| commit | d5bf0ecf31f33fb31763995e3c8bfab69dc2457f (patch) | |
| tree | 278698d906e98d2dc1f348b0bfbd3f8da4fef350 | |
| parent | 11285a304c143d1bdf3a1e321803cfcc8a6a938c (diff) | |
| download | external_skia-d5bf0ecf31f33fb31763995e3c8bfab69dc2457f.zip external_skia-d5bf0ecf31f33fb31763995e3c8bfab69dc2457f.tar.gz external_skia-d5bf0ecf31f33fb31763995e3c8bfab69dc2457f.tar.bz2 | |
Adapting Skia's tests to the native test framework.
| -rw-r--r-- | tests/Android.mk | 53 | ||||
| -rw-r--r-- | tests/skia_test.cpp (renamed from tests/testmain.cpp) | 2 |
2 files changed, 30 insertions, 25 deletions
diff --git a/tests/Android.mk b/tests/Android.mk index 11665cd..cf7e6f7 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -1,35 +1,40 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) + LOCAL_SRC_FILES:= \ - GeometryTest.cpp \ - MathTest.cpp \ - MatrixTest.cpp \ - PackBitsTest.cpp \ - Sk64Test.cpp \ - StringTest.cpp \ - Test.cpp UtilsTest.cpp \ - PathTest.cpp \ - SrcOverTest.cpp \ - StreamTest.cpp \ - SortTest.cpp \ - PathMeasureTest.cpp \ - testmain.cpp + GeometryTest.cpp \ + MathTest.cpp \ + MatrixTest.cpp \ + PackBitsTest.cpp \ + Sk64Test.cpp \ + StringTest.cpp \ + Test.cpp UtilsTest.cpp \ + PathTest.cpp \ + SrcOverTest.cpp \ + StreamTest.cpp \ + SortTest.cpp \ + PathMeasureTest.cpp + +# The name of the file with a main function must +# match native test's naming rule: xxx_test.cpp. +LOCAL_SRC_FILES += \ + skia_test.cpp + +LOCAL_MODULE:= skia_test LOCAL_C_INCLUDES := \ - external/skia/include/core \ - external/skia/include/effects \ - external/skia/include/images \ - external/skia/include/ports \ - external/skia/include/utils \ - external/skia/src/core + external/skia/include/core \ + external/skia/include/effects \ + external/skia/include/images \ + external/skia/include/ports \ + external/skia/include/utils \ + external/skia/src/core LOCAL_SHARED_LIBRARIES := \ - libcorecg \ - libsgl - -LOCAL_MODULE:= test-skia-unit + libcorecg \ + libsgl -LOCAL_MODULE_TAGS := tests +LOCAL_MODULE_TAGS := eng tests include $(BUILD_EXECUTABLE) diff --git a/tests/testmain.cpp b/tests/skia_test.cpp index f09fded..91b41ed 100644 --- a/tests/testmain.cpp +++ b/tests/skia_test.cpp @@ -107,7 +107,7 @@ public: int main (int argc, char * const argv[]) { SkAutoGraphics ag; - + bool androidMode = false; for (int i = 1; i < argc; i++) { if (!strcmp(argv[i], "-android")) { |