Merge branch 'main' of github.com:unicode-org/conformance

sven-oly · Jan 9, 2024 · 350165f · 350165f
2 parents 7091b62 + 6998aaf
commit 350165f
Show file tree

Hide file tree

Showing 14 changed files with 678 additions and 82 deletions.
diff --git a/executors/cpp/likely_subtags.cpp b/executors/cpp/likely_subtags.cpp
@@ -1,7 +1,3 @@
-/********************************************************************
- * Comments and license as needed
- ************************************
-
 /******
  * testing likely subtags for locales
  */

diff --git a/executors/cpp/main.cpp b/executors/cpp/main.cpp
@@ -44,12 +44,11 @@ extern const string test_langnames(json_object *json_in);
 extern const string test_likely_subtags(json_object *json_in);
 extern const string test_numfmt(json_object *json_in);
 
-// extern const string test_numfmt(json_object *json_in);
-std::string supported_tests[6] = {
-  "collation_short"
+std::string supported_tests[4] = {
+  "collation_short",
+  "likely_subtags",
   "lang_names",
-  "likely_subtags"
-  "number_fmt",
+  "number_fmt"
 };
 
 
@@ -111,18 +110,13 @@ int main(int argc, const char** argv)
       else if (test_type == "lang_names") {
         outputLine = test_langnames(json_input);
       }
-      else if (test_type == "likely_subtags") {
-        // !!!       outputLine = test_likely_subtags(json_input);
-      }
       else {
         outputLine =  "# BAD TEST " + test_type;
         //       "{\"error\": \"unknown test type\"," +
         //       "\"test_type\":" +  test_type + "," +
         //       "\"unsupported_test:\"" + test_type + "}";
       }
 
-      // TODO: Instead of a string, get JSON output and stringify it.
-      // cout << "# GOT FROM TEST: " << outputLine << endl;
       cout << outputLine << endl;
     }