ec3ed6a5eb
I have manually examined all of these diffs and restored a few files that seem to require manual adjustment. The following files still need to be modified manually, in a separate CL: android_sample/SampleApp/AndroidManifest.xml android_sample/SampleApp/res/layout/layout.xml android_sample/SampleApp/res/menu/sample.xml android_sample/SampleApp/res/values/strings.xml android_sample/SampleApp/src/com/skia/sampleapp/SampleApp.java android_sample/SampleApp/src/com/skia/sampleapp/SampleView.java experimental/CiCarbonSampleMain.c experimental/CocoaDebugger/main.m experimental/FileReaderApp/main.m experimental/SimpleCocoaApp/main.m experimental/iOSSampleApp/Shared/SkAlertPrompt.h experimental/iOSSampleApp/Shared/SkAlertPrompt.m experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig experimental/iOSSampleApp/SkiOSSampleApp-Debug.xcconfig experimental/iOSSampleApp/SkiOSSampleApp-Release.xcconfig gpu/src/android/GrGLDefaultInterface_android.cpp gyp/common.gypi gyp_skia include/ports/SkHarfBuzzFont.h include/views/SkOSWindow_wxwidgets.h make.bat make.py src/opts/memset.arm.S src/opts/memset16_neon.S src/opts/memset32_neon.S src/opts/opts_check_arm.cpp src/ports/SkDebug_brew.cpp src/ports/SkMemory_brew.cpp src/ports/SkOSFile_brew.cpp src/ports/SkXMLParser_empty.cpp src/utils/ios/SkImageDecoder_iOS.mm src/utils/ios/SkOSFile_iOS.mm src/utils/ios/SkStream_NSData.mm tests/FillPathTest.cpp Review URL: http://codereview.appspot.com/4816058 git-svn-id: http://skia.googlecode.com/svn/trunk@1982 2bbb7eff-a529-9590-31e7-b0007b416f81
135 lines
3.4 KiB
C++
135 lines
3.4 KiB
C++
|
|
/*
|
|
* Copyright 2011 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
#include "SkGraphics.h"
|
|
#include "Test.h"
|
|
|
|
using namespace skiatest;
|
|
|
|
// need to explicitly declare this, or we get some weird infinite loop llist
|
|
template TestRegistry* TestRegistry::gHead;
|
|
|
|
class Iter {
|
|
public:
|
|
Iter(Reporter* r) : fReporter(r) {
|
|
r->ref();
|
|
fReg = TestRegistry::Head();
|
|
}
|
|
|
|
~Iter() {
|
|
fReporter->unref();
|
|
}
|
|
|
|
Test* next() {
|
|
if (fReg) {
|
|
TestRegistry::Factory fact = fReg->factory();
|
|
fReg = fReg->next();
|
|
Test* test = fact(NULL);
|
|
test->setReporter(fReporter);
|
|
return test;
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
static int Count() {
|
|
const TestRegistry* reg = TestRegistry::Head();
|
|
int count = 0;
|
|
while (reg) {
|
|
count += 1;
|
|
reg = reg->next();
|
|
}
|
|
return count;
|
|
}
|
|
|
|
private:
|
|
Reporter* fReporter;
|
|
const TestRegistry* fReg;
|
|
};
|
|
|
|
static const char* result2string(Reporter::Result result) {
|
|
return result == Reporter::kPassed ? "passed" : "FAILED";
|
|
}
|
|
|
|
class DebugfReporter : public Reporter {
|
|
public:
|
|
DebugfReporter(bool androidMode) : fAndroidMode(androidMode) {}
|
|
|
|
void setIndexOfTotal(int index, int total) {
|
|
fIndex = index;
|
|
fTotal = total;
|
|
}
|
|
protected:
|
|
virtual void onStart(Test* test) {
|
|
this->dumpState(test, kStarting_State);
|
|
}
|
|
virtual void onReport(const char desc[], Reporter::Result result) {
|
|
if (!fAndroidMode) {
|
|
SkDebugf("\t%s: %s\n", result2string(result), desc);
|
|
}
|
|
}
|
|
virtual void onEnd(Test* test) {
|
|
this->dumpState(test, this->getCurrSuccess() ?
|
|
kSucceeded_State : kFailed_State);
|
|
}
|
|
private:
|
|
enum State {
|
|
kStarting_State = 1,
|
|
kSucceeded_State = 0,
|
|
kFailed_State = -2
|
|
};
|
|
|
|
void dumpState(Test* test, State state) {
|
|
if (fAndroidMode) {
|
|
SkDebugf("INSTRUMENTATION_STATUS: test=%s\n", test->getName());
|
|
SkDebugf("INSTRUMENTATION_STATUS: class=com.skia\n");
|
|
SkDebugf("INSTRUMENTATION_STATUS: current=%d\n", fIndex+1);
|
|
SkDebugf("INSTRUMENTATION_STATUS: numtests=%d\n", fTotal);
|
|
SkDebugf("INSTRUMENTATION_STATUS_CODE: %d\n", state);
|
|
} else {
|
|
if (kStarting_State == state) {
|
|
SkDebugf("[%d/%d] %s...\n", fIndex+1, fTotal, test->getName());
|
|
} else if (kFailed_State == state) {
|
|
SkDebugf("---- FAILED\n");
|
|
}
|
|
}
|
|
}
|
|
|
|
int fIndex, fTotal;
|
|
bool fAndroidMode;
|
|
};
|
|
|
|
int main (int argc, char * const argv[]) {
|
|
SkAutoGraphics ag;
|
|
|
|
bool androidMode = false;
|
|
for (int i = 1; i < argc; i++) {
|
|
if (!strcmp(argv[i], "-android")) {
|
|
androidMode = true;
|
|
}
|
|
}
|
|
|
|
DebugfReporter reporter(androidMode);
|
|
Iter iter(&reporter);
|
|
Test* test;
|
|
|
|
const int count = Iter::Count();
|
|
int index = 0;
|
|
int successCount = 0;
|
|
while ((test = iter.next()) != NULL) {
|
|
reporter.setIndexOfTotal(index, count);
|
|
successCount += test->run();
|
|
SkDELETE(test);
|
|
index += 1;
|
|
}
|
|
|
|
if (!androidMode) {
|
|
SkDebugf("Finished %d tests, %d failures.\n", count,
|
|
count - successCount);
|
|
}
|
|
return (count == successCount) ? 0 : 1;
|
|
}
|