Add command line argument to specify the rendertests file.

Change-Id: I53a8c2f168108fa5003c54ffece67fc20c38bb09
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/275137
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Reviewed-by: John Rosasco <rosasco@google.com>
Commit-Queue: John Rosasco <rosasco@google.com>

build/fuchsia/skqp/skqp.cmx

@@ -1,7 +1,7 @@
 {
     "program": {
         "binary": "bin/skqp",
-        "args" : [ "/pkg/data", "tmp/logs" ]
+        "args" : [ "/pkg/data", "skqp/rendertests_fuchsia.txt", "/tmp/logs" ]
     },
     "sandbox": {
         "dev": [

src/ports/SkOSFile_stdio.cpp

@@ -186,6 +186,9 @@ bool sk_mkdir(const char* path) {
     retval = _mkdir(path);
 #else
     retval = mkdir(path, 0777);
+    if (retval) {
+      perror("mkdir() failed with error: ");
+    }
 #endif
     return 0 == retval;
 }

tools/skqp/src/jni_skqp.cpp

@@ -115,7 +115,7 @@ void Java_org_skia_skqp_SkQP_nInit(JNIEnv* env, jobject object, jobject assetMan
     jassert(env, gAAssetManager,);
 
     std::lock_guard<std::mutex> lock(gMutex);
-    gSkQP.init(&gAndroidAssetManager, reportDirectory.c_str());
+    gSkQP.init(&gAndroidAssetManager, nullptr, reportDirectory.c_str());
 
     auto backends = gSkQP.getSupportedBackends();
     jassert(env, backends.size() > 0,);

tools/skqp/src/skqp.cpp

@@ -45,7 +45,7 @@
 
 static constexpr char kRenderTestCSVReport[] = "out.csv";
 static constexpr char kRenderTestReportPath[] = "report.html";
-static constexpr char kRenderTestsPath[] = "skqp/rendertests.txt";
+static constexpr char kDefaultRenderTestsPath[] = "skqp/rendertests.txt";
 static constexpr char kUnitTestReportPath[] = "unit_tests.txt";
 static constexpr char kUnitTestsPath[]   = "skqp/unittests.txt";
 
@@ -89,8 +89,11 @@ static void get_unit_tests(SkQPAssetManager* mgr, std::vector<SkQP::UnitTest>* u
 }
 
 static void get_render_tests(SkQPAssetManager* mgr,
+                             const char *renderTestsIn,
                              std::vector<SkQP::GMFactory>* gmlist,
                              std::unordered_map<std::string, int64_t>* gmThresholds) {
+    // Runs all render tests if the |renderTests| file can't be found or is empty.
+    const char *renderTests = renderTestsIn ? renderTestsIn : kDefaultRenderTestsPath;
     auto insert = [gmThresholds](const char* s, size_t l) {
         SkASSERT(l > 1) ;
         if (l > 0 && s[l - 1] == '\n') {  // strip line endings.
@@ -117,7 +120,7 @@ static void get_render_tests(SkQPAssetManager* mgr,
         }
         gmThresholds->insert({std::move(key), value});  // (*gmThresholds)[s] = value;
     };
-    if (sk_sp<SkData> dat = mgr->open(kRenderTestsPath)) {
+    if (sk_sp<SkData> dat = mgr->open(renderTests)) {
         readlines(dat->data(), dat->size(), insert);
     }
     using GmAndName = std::pair<SkQP::GMFactory, std::string>;
@@ -246,7 +249,7 @@ SkQP::SkQP() {}
 
 SkQP::~SkQP() {}
 
-void SkQP::init(SkQPAssetManager* am, const char* reportDirectory) {
+void SkQP::init(SkQPAssetManager* am, const char* renderTests, const char* reportDirectory) {
     SkASSERT_RELEASE(!fAssetManager);
     SkASSERT_RELEASE(am);
     fAssetManager = am;
@@ -255,9 +258,7 @@ void SkQP::init(SkQPAssetManager* am, const char* reportDirectory) {
     SkGraphics::Init();
     gSkFontMgr_DefaultFactory = &ToolUtils::MakePortableFontMgr;
 
-    /* If the file "skqp/rendertests.txt" does not exist or is empty, run all
+    get_render_tests(fAssetManager, renderTests, &fGMs, &fGMThresholds);
-       render tests.  Otherwise only run tests mentioned in that file.  */
-    get_render_tests(fAssetManager, &fGMs, &fGMThresholds);
     /* If the file "skqp/unittests.txt" does not exist or is empty, run all gpu
        unit tests.  Otherwise only run tests mentioned in that file.  */
     get_unit_tests(fAssetManager, &fUnitTests);

tools/skqp/src/skqp.h

@@ -64,9 +64,10 @@ public:
         Initialize Skia and the SkQP.  Should be executed only once.
 
         @param assetManager - provides assets for the models.  Does not take ownership.
+        @param renderTests - file containing list of render tests.
         @param reportDirectory - where to write out report.
     */
-    void init(SkQPAssetManager* assetManager, const char* reportDirectory);
+    void init(SkQPAssetManager* assetManager, const char* renderTests, const char* reportDirectory);
 
     struct RenderOutcome {
         // All three values will be 0 if the test passes.

tools/skqp/src/skqp_main.cpp

@@ -30,6 +30,12 @@ public:
 private:
     std::string fPrefix;
 };
+
+struct Args {
+  char *assetDir;
+  char *renderTests;
+  char *outputDir;
+};
 }
 
 static constexpr char kSkipUsage[] =
@@ -73,25 +79,34 @@ static bool should_skip(const char* const* rules, size_t count, const char* name
     return !anyExclude;
 }
 
-int main(int argc, char** argv) {
+static void parse_args(int argc, char *argv[], Args *args) {
-    if (argc < 3) {
+  if (argc < 4) {
       std::cerr << "Usage:\n  " << argv[0]
-                  << " ASSET_DIRECTORY_PATH SKQP_REPORT_PATH [TEST_MATCH_RULES]\n"
+                << " ASSET_DIR RENDER_TESTS OUTPUT_DIR [TEST_MATCH_RULES]\n"
                 << kSkipUsage << '\n';
-        return 1;
+      exit(1);
   }
-    SetResourcePath((std::string(argv[1]) + "/resources").c_str());
+  args->assetDir = argv[1];
-    if (!sk_mkdir(argv[2])) {
+  args->renderTests = argv[2];
-        std::cerr << "sk_mkdir(" << argv[2] << ") failed.\n";
+  args->outputDir = argv[3];
+}
+
+int main(int argc, char *argv[]) {
+    Args args;
+    parse_args(argc, argv, &args);
+
+    SetResourcePath(std::string(args.assetDir + std::string("/resources")).c_str());
+    if (!sk_mkdir(args.outputDir)) {
+        std::cerr << "sk_mkdir(" << args.outputDir << ") failed.\n";
         return 2;
     }
-    StdAssetManager mgr(argv[1]);
+    StdAssetManager mgr(args.assetDir);
     SkQP skqp;
-    skqp.init(&mgr, argv[2]);
+    skqp.init(&mgr, args.renderTests, args.outputDir);
     int ret = 0;
 
-    const char* const* matchRules = &argv[3];
+    const char* const* matchRules = &argv[4];
-    size_t matchRulesCount = (size_t)(argc - 3);
+    size_t matchRulesCount = (size_t)(argc - 4);
 
     // Rendering Tests
     std::ostream& out = std::cout;