Fix expectations in GM PDF rendering

gm/gmmain.cpp

Index: gm/gmmain.cpp
diff --git a/gm/gmmain.cpp b/gm/gmmain.cpp
index 4db3a0d24272d26c0c4a59f31a0933cac0e86045..707a02a865465fb6e90cf60e7f5f0a3b15c834c4 100644
--- a/gm/gmmain.cpp
+++ b/gm/gmmain.cpp
@@ -860,14 +860,17 @@ public:
      *
      * @param gm which test generated the actualBitmap
      * @param gRec
+     * @param configName configuration name to use in the expectations file,
+     *        usually gRec.fName unless using sub-configurations (like indicating
+     *        PDF renderers)
      * @param actualBitmapAndDigest ptr to bitmap generated by this run, or NULL
      *        if we don't have a usable bitmap representation
      */
     ErrorCombination compare_test_results_to_stored_expectations(
-        GM* gm, const ConfigData& gRec,
+        GM* gm, const ConfigData& gRec, const char* configName,
         const BitmapAndDigest* actualBitmapAndDigest) {
 
-        SkString shortNamePlusConfig = make_shortname_plus_config(gm->shortName(), gRec.fName);
+        SkString shortNamePlusConfig = make_shortname_plus_config(gm->shortName(), configName);
 
         ErrorCombination errors;
 
@@ -905,7 +908,7 @@ public:
                  */
                 Expectations expectations = expectationsSource->get(nameWithExtension.c_str());
                 errors.add(compare_to_expectations(expectations, *actualBitmapAndDigest,
-                                                   gm->shortName(), gRec.fName, "", true));
+                                                   gm->shortName(), configName, "", true));
             } else {
                 // If we are running without expectations, we still want to
                 // record the actual results.
@@ -1022,7 +1025,7 @@ public:
             }
             BitmapAndDigest bitmapAndDigest(*bitmap);
             errors.add(compare_test_results_to_stored_expectations(
-                           gm, gRec, &bitmapAndDigest));
+                           gm, gRec, gRec.fName, &bitmapAndDigest));
 
             if (writePath && (gRec.fFlags & kWrite_ConfigFlag)) {
                 path = make_bitmap_filename(writePath, gm->shortName(), gRec.fName,
@@ -1051,14 +1054,14 @@ public:
                         continue;
                     }
 
-                    BitmapAndDigest bitmapAndDigest(pdfBitmap);
-                    errors.add(compare_test_results_to_stored_expectations(
-                               gm, gRec, &bitmapAndDigest));
-
                     SkString configName(gRec.fName);
-                    configName.append("_");
+                    configName.append("-");
                     configName.append(pdfRasterizers[i]->fName);
 
+                    BitmapAndDigest bitmapAndDigest(pdfBitmap);
+                    errors.add(compare_test_results_to_stored_expectations(
+                               gm, gRec, configName.c_str(), &bitmapAndDigest));
+
                     if (writePath && (gRec.fFlags & kWrite_ConfigFlag)) {
                         path = make_bitmap_filename(writePath, gm->shortName(), configName.c_str(),
                                                     "", bitmapAndDigest.fDigest);
@@ -1073,7 +1076,7 @@ public:
             SkAutoTUnref<SkStreamAsset> documentStream(document.detachAsStream());
 
             errors.add(compare_test_results_to_stored_expectations(
-                           gm, gRec, NULL));
+                           gm, gRec, gRec.fName, NULL));
 
             if (writePath && (gRec.fFlags & kWrite_ConfigFlag)) {
                 path = make_filename(writePath, gm->shortName(), gRec.fName, "", "xps");
@@ -1825,7 +1828,7 @@ static bool prepare_subdirectories(const char *root, bool useFileHierarchy,
             if (config.fBackend == kPDF_Backend) {
                 for (int j = 0; j < pdfRasterizers.count(); j++) {
                     SkString pdfSubdir = subdir;
-                    pdfSubdir.appendf("_%s", pdfRasterizers[j]->fName);
+                    pdfSubdir.appendf("-%s", pdfRasterizers[j]->fName);
                     if (!sk_mkdir(pdfSubdir.c_str())) {
                         return false;
                     }