Remove the unnecessary test_normalization_input.py.

ufal · Sep 29, 2023 · 2728905 · 2728905
1 parent b2fe323
commit 2728905
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 18 deletions.
diff --git a/tests/Makefile b/tests/Makefile
@@ -24,7 +24,7 @@ run_test_conversion: $(call exe,test_conversion)
 run_test_full_casing: $(call exe,test_full_casing)
 	$(call platform_name,./$<) <../gen/data/SpecialCasing.txt
 run_test_normalization: $(call exe,test_normalization)
-	python3 test_normalization_input.py ../gen/data/NormalizationTest.txt | $(call platform_name,./$<)
+	$(call platform_name,./$<) <../gen/data/NormalizationTest.txt
 run_test_strip: $(call exe,test_strip)
 	$(call platform_name,./$<)
 run_test_ucd: $(call exe,test_ucd)

diff --git a/tests/test_normalization.cpp b/tests/test_normalization.cpp
@@ -27,9 +27,12 @@ int main(void) {
   vector<u32string> forms(5);
   vector<bool> tested_chars(0x110000);
   while (getline(cin, line)) {
+    if (line.empty() || line.compare(0, 1, "#") == 0 || line.compare(0, 1, "@") == 0) continue;
+
     split(line, ';', words);
-    if (words.size() != forms.size()) return cerr << "Cannot parse NormalizationTest line " << line << endl, 1;
-    for (unsigned i = 0; i < words.size(); i++) {
+    if (words.size() < forms.size()) return cerr << "Cannot parse NormalizationTest line " << line << endl, 1;
+
+    for (unsigned i = 0; i < forms.size(); i++) {
       split(words[i], ' ', characters);
       forms[i].clear();
       for (auto&& character : characters)

diff --git a/tests/test_normalization_input.py b/tests/test_normalization_input.py