[subset] temporarily revert previous cmap commit

Required in https://github.com/harfbuzz/harfbuzz/issues/2356

src/hb-ot-cmap-table.hh

@@ -238,7 +238,8 @@ struct CmapSubtableFormat4
 		 { return _.first <= 0xFFFF; })
     ;
 
-    if (format4_iter.len () == 0) return;
+    //comment off temporarily while we're working on supporting --gids option
+    //if (format4_iter.len () == 0) return;
 
     unsigned table_initpos = c->length ();
     if (unlikely (!c->extend_min (*this))) return;

test/api/test-subset-cmap.c

@@ -113,6 +113,7 @@ test_subset_cmap4_no_exceeding_maximum_codepoint (void)
   hb_face_destroy (face_origin);
 }
 
+/* TEMPORARILY COMMENTED OFF
 static void
 test_subset_cmap_empty_tables (void)
 {
@@ -132,6 +133,7 @@ test_subset_cmap_empty_tables (void)
   hb_face_destroy (face_abc);
   hb_face_destroy (face_empty);
 }
+*/
 
 static void
 test_subset_cmap_noto_color_emoji_noop (void)
@@ -186,7 +188,7 @@ main (int argc, char **argv)
   hb_test_add (test_subset_cmap_noop);
   hb_test_add (test_subset_cmap_non_consecutive_glyphs);
   hb_test_add (test_subset_cmap4_no_exceeding_maximum_codepoint);
-  hb_test_add (test_subset_cmap_empty_tables);
+  //hb_test_add (test_subset_cmap_empty_tables);
   hb_test_add (test_subset_cmap_noto_color_emoji_noop);
   hb_test_add (test_subset_cmap_noto_color_emoji_non_consecutive_glyphs);
 

test/subset/data/Makefile.sources

@@ -4,7 +4,6 @@ TESTS = \
 	tests/cff-full-font.tests \
 	tests/japanese.tests \
 	tests/cff-japanese.tests \
-	tests/cmap.tests \
 	tests/cmap14.tests \
 	tests/sbix.tests \
 	tests/colr.tests \
@@ -21,6 +20,7 @@ DISABLED_TESTS = \
 	tests/layout.gsub3.tests \
 	tests/layout.gsub6.tests \
 	tests/layout.gdef.tests \
+	tests/cmap.tests \
 	$(NULL)
 
 XFAIL_TESTS = \

test/subset/data/tests/japanese.tests

@@ -13,6 +13,5 @@ acek
 あいうえおか
 あいう珠度輸
 𝜕𝟘AB
-𥝱
 
 

test/subset/meson.build

@@ -13,7 +13,6 @@ tests = [
   'layout.gsub3',
   'layout.gsub6',
   'layout.gdef',
-  'cmap',
   'cmap14',
   'sbix',
   'colr',